diff --git a/Makefile.PL b/Makefile.PL index 926f00e..87bf022 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -11,7 +11,7 @@ use strict; -my $libname = "libqt-mt.so"; +my $libname = "libtqt-mt.so"; my @prefix = ('/usr', '/usr/local'); my $res=""; diff --git a/PerlTQt/Makefile.PL.in b/PerlTQt/Makefile.PL.in index efa6618..ea2dd0c 100644 --- a/PerlTQt/Makefile.PL.in +++ b/PerlTQt/Makefile.PL.in @@ -22,9 +22,9 @@ $x{'X_PRE_LIBS'} = '@X_PRE_LIBS@'; interpolate('LIB_X11', 'exec_prefix', 'libdir', 'datadir'); my $objects='TQt$(OBJ_EXT) handlers$(OBJ_EXT)'; -my $qtlib ='@LIB_TQT@'; +my $tqtlib ='@LIB_TQT@'; -interpolate(\$qtlib); +interpolate(\$tqtlib); my $rpath='@USE_RPATH@'; @@ -40,7 +40,7 @@ if($^O =~ /solaris/i && $cxx eq 'CC') { /^build_old_libs=yes/ && $only_static++; } # ...then add the C++ runtime lib - $qtlib .= ' -lCrun' if($only_static == 2); + $tqtlib .= ' -lCrun' if($only_static == 2); } my $libtool = File::Spec->catfile( $topdir, "libtool" ); @@ -85,7 +85,7 @@ WriteMakefile( 'VERSION_FROM' => 'TQt.pm', # finds $VERSION 'PREREQ_PM' => {}, # e.g., Module::Name => 1.1, 'INC' => '@all_includes@ -I. -I../smoke', - 'LIBS' => ['@all_libraries@'." -L$localsmoke -lsmoketqt ".'@LIBCRYPT@'." $qtlib"], + 'LIBS' => ['@all_libraries@'." -L$localsmoke -lsmoketqt ".'@LIBCRYPT@'." $tqtlib"], # 'XS' => {'TQt.xs' => 'TQt.cpp'}, # does not work ... still expects TQt.c 'XSOPT' => "-C++", 'OBJECT' => "$objects", # Object files @@ -132,7 +132,7 @@ sub MY::install { package MY; my $i = shift->SUPER::install(@_); my $lng = $ENV{LANG}; - my $doc_dir = "/usr/share/doc/libqt-perl/tutorial"; + my $doc_dir = "/usr/share/doc/libtqt-perl/tutorial"; my $src= File::Spec->catdir(File::Spec->updir, "doc"); my $found = 0; # for my $l( split(":", $lng) ) @@ -151,7 +151,7 @@ sub MY::install { $i .= "\ninstall_my_perlqt_doc:\n". "\t\@echo Installing documentation in ${doc_dir}\n". "\t\@$^X -MExtUtils::Install -MConfig -e \\\n". - "\t\t'install({ \"$src\" => \"\$(PREFIX)/share/doc/libqt-perl/tutorial\" },0,0)' \$(DEV_NULL)\n"; + "\t\t'install({ \"$src\" => \"\$(PREFIX)/share/doc/libtqt-perl/tutorial\" },0,0)' \$(DEV_NULL)\n"; $doc_dir_glob = $doc_dir; $i; } diff --git a/PerlTQt/TQt.pod b/PerlTQt/TQt.pod index 2feceeb..45fcec9 100644 --- a/PerlTQt/TQt.pod +++ b/PerlTQt/TQt.pod @@ -29,7 +29,7 @@ This is where anyone new to PerlTQt should start. The tutorial has been originally installed -on this system in C, in both B and +on this system in C, in both B and B format. For a complete IDE allowing RAD and visual programming, diff --git a/acinclude.m4 b/acinclude.m4 index 1f77768..5d6f425 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -366,7 +366,7 @@ AC_DEFUN(KDE_1_CHECK_PATHS, fi AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBTQT $KDE_TEST_RPATH 1>&5' if AC_TRY_EVAL(ac_link) && test -s conftest; then AC_MSG_RESULT(yes) @@ -1166,9 +1166,9 @@ ac_libs_safe="$LIBS" CXXFLAGS="$CXXFLAGS -I$tqt_includes" LDFLAGS="$LDFLAGS $X_LDFLAGS" if test "x$kde_use_qt_emb" != "xyes"; then -LIBS="$LIBQT -lXext -lX11 $LIBSOCKET" +LIBS="$LIBTQT -lXext -lX11 $LIBSOCKET" else -LIBS="$LIBQT $LIBSOCKET" +LIBS="$LIBTQT $LIBSOCKET" fi LD_LIBRARY_PATH= export LD_LIBRARY_PATH @@ -1208,7 +1208,7 @@ fi dnl ------------------------------------------------------------------------ dnl Try to find the TQt headers and libraries. -dnl $(TQT_LDFLAGS) will be -Lqtliblocation (if needed) +dnl $(TQT_LDFLAGS) will be -Ltqtliblocation (if needed) dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed) dnl ------------------------------------------------------------------------ dnl @@ -1263,25 +1263,25 @@ dnl If we haven't been told how to link to TQt, we work it out for ourselves. dnl ------------------------------------------------------------------------ if test -z "$LIBTQT_GLOB"; then if test "x$kde_use_qt_emb" = "xyes"; then - LIBTQT_GLOB="libqte.*" + LIBTQT_GLOB="libtqte.*" else - LIBTQT_GLOB="libqt.*" + LIBTQT_GLOB="libtqt.*" fi fi -if test -z "$LIBQT"; then +if test -z "$LIBTQT"; then dnl ------------------------------------------------------------ dnl If we got --enable-embedded then adjust the TQt library name. dnl ------------------------------------------------------------ if test "x$kde_use_qt_emb" = "xyes"; then - qtlib="tqte" + tqtlib="tqte" else - qtlib="tqt" + tqtlib="tqt" fi - kde_int_qt="-l$qtlib" + kde_int_qt="-l$tqtlib" else - kde_int_qt="$LIBQT" + kde_int_qt="$LIBTQT" kde_lib_qt_set=yes fi @@ -1305,36 +1305,36 @@ dnl If we got --enable-qt-mt then adjust the TQt library name for the host. dnl ------------------------------------------------------------------------ if test "x$kde_use_qt_mt" = "xyes"; then - if test -z "$LIBQT"; then - LIBQT="-l$qtlib-mt" - kde_int_qt="-l$qtlib-mt" + if test -z "$LIBTQT"; then + LIBTQT="-l$tqtlib-mt" + kde_int_qt="-l$tqtlib-mt" else - LIBQT="$qtlib-mt" - kde_int_qt="$qtlib-mt" + LIBTQT="$tqtlib-mt" + kde_int_qt="$tqtlib-mt" fi - LIBTQT_GLOB="lib$qtlib-mt.*" + LIBTQT_GLOB="lib$tqtlib-mt.*" USING_TQT_MT="using -mt" else - LIBQT="-l$qtlib" + LIBTQT="-l$tqtlib" fi if test $kde_qtver != 1; then AC_REQUIRE([AC_FIND_PNG]) AC_REQUIRE([AC_FIND_JPEG]) - LIBQT="$LIBQT $LIBPNG $LIBJPEG" + LIBTQT="$LIBTQT $LIBPNG $LIBJPEG" fi if test $kde_qtver = 3; then AC_REQUIRE([KDE_CHECK_LIBDL]) - LIBQT="$LIBQT $LIBDL" + LIBTQT="$LIBTQT $LIBDL" kde_int_qt="$kde_int_qt $LIBDL" fi AC_MSG_CHECKING([for TQt]) if test "x$kde_use_qt_emb" != "xyes"; then -LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" +LIBTQT="$LIBTQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" fi ac_tqt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO qt_libraries="" @@ -1390,7 +1390,7 @@ if test ! "$ac_qt_libraries" = "NO"; then qt_libdir=$ac_qt_libraries else qt_libdirs="$ac_qt_libraries $qt_libdirs" - # if the TQt was given, the chance is too big that libqt.* doesn't exist + # if the TQt was given, the chance is too big that libtqt.* doesn't exist qt_libdir=NONE for dir in $qt_libdirs; do try="ls -1 $dir/${LIBTQT_GLOB}" @@ -1409,7 +1409,7 @@ ac_libs_safe="$LIBS" CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" -LIBS="$LIBS $LIBQT $KDE_MT_LIBS" +LIBS="$LIBS $LIBTQT $KDE_MT_LIBS" KDE_PRINT_TQT_PROGRAM @@ -1440,9 +1440,9 @@ if test "$ac_tqt_includes" = NO || test "$ac_qt_libraries" = NO; then if test "x$kde_use_qt_mt" = "xyes"; then missing_qt_mt=" Make sure that you have compiled TQt with thread support!" - ac_qt_notfound="(library $qtlib-mt)"; + ac_qt_notfound="(library $tqtlib-mt)"; else - ac_qt_notfound="(library $qtlib)"; + ac_qt_notfound="(library $tqtlib)"; fi fi @@ -1895,7 +1895,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_libs_safe="$LIBS" kde_cxxflags_safe="$CXXFLAGS" - LIBS="-lkde-qt-addon $LIBQT $LIBS" + LIBS="-lkde-qt-addon $LIBTQT $LIBS" CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" @@ -1936,7 +1936,7 @@ AC_DEFUN(KDE_CHECK_KIMGIO, AC_LANG_SAVE AC_LANG_CPLUSPLUS kde_save_LIBS="$LIBS" - LIBS="$LIBS $all_libraries $LIBJPEG $LIBTIFF $LIBPNG $LIBQT -lm" + LIBS="$LIBS $all_libraries $LIBJPEG $LIBTIFF $LIBPNG $LIBTQT -lm" AC_CHECK_LIB(kimgio, kimgioRegister, [ LIBKIMGIO_EXISTS=yes],LIBKIMGIO_EXISTS=no) LIBS="$kde_save_LIBS" @@ -2439,7 +2439,7 @@ AC_CACHE_VAL(kde_cv_qt_jpeg, AC_LANG_SAVE AC_LANG_CPLUSPLUS ac_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS $LIBQT" +LIBS="$all_libraries $USER_LDFLAGS $LIBTQT" LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" @@ -4301,7 +4301,7 @@ AC_LANG_SAVE AC_LANG_CPLUSPLUS ac_save_LIBS="$LIBS" ac_save_CXXFLAGS="$CXXFLAGS" -LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT" +LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBTQT" CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" AC_TRY_RUN(dnl [ @@ -5031,7 +5031,7 @@ is required.]) CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" LDFLAGS="$LDFLAGS $TQT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" - LIBS="$LIBS $LIB_TQTOPIA $LIBQT" + LIBS="$LIBS $LIB_TQTOPIA $LIBTQT" cat > conftest.$ac_ext < conftest.$ac_ext <{astNodeName} ) { #All the constructors are generated here except the dummy constructor #print CLASS "\n// DLLImport goes here..."; - print CLASS "\n\n\t\t[DllImport(\"libqtc.so\", CharSet=CharSet.Ansi)]"; + print CLASS "\n\n\t\t[DllImport(\"libtqtc.so\", CharSet=CharSet.Ansi)]"; print CLASS "\n\t\tprivate static extern IntPtr ", $typeprefix, "new_", $function, "(", $pinvokeparams, ");"; print CLASS "\n\t\t", $csharpaccess, " ", $class->{astNodeName}, "(", $csharpparams, ") "; if ($ancestorCount >= 0) { @@ -677,7 +677,7 @@ sub listMember } #Static Methods are generated here #print CLASS "\n\n\t\t// DLLImport method goes here..."; - print CLASS "\n\n\t\t[DllImport(\"libqtc.so\", CharSet=CharSet.Ansi)]"; + print CLASS "\n\n\t\t[DllImport(\"libtqtc.so\", CharSet=CharSet.Ansi)]"; print CLASS "\n\t\tprivate static extern", " ", $returnType, " ", $typeprefix, $class->{astNodeName}, "_", $function, "(", $pinvokeparams, ");"; print CLASS "\n\t\t", $csharpaccess, " ", $returnType, " ", $name, "(", $csharpparams, ") {"; if ($returnType =~ /void/ ) { @@ -694,7 +694,7 @@ sub listMember } #Methods are generated here #print CLASS "\n\n\t\t// DLLImport method goes here..."; - print CLASS "\n\n\t\t[DllImport(\"libqtc.so\", CharSet=CharSet.Ansi)]"; + print CLASS "\n\n\t\t[DllImport(\"libtqtc.so\", CharSet=CharSet.Ansi)]"; print CLASS "\n\t\tprivate static extern", " ", $returnType, " ", $typeprefix, $class->{astNodeName}, "_", $function, "(", "IntPtr raw", ($pinvokeparams eq "" ? "" : ", "), $pinvokeparams, ");"; print CLASS "\n\t\t", $csharpaccess, " ", $returnType, " ", checkReserved($name), "(", $csharpparams, ") {"; if ($returnType =~ /void/ ) { diff --git a/puic/puic.pro b/puic/puic.pro index 62916e2..4ebe49e 100644 --- a/puic/puic.pro +++ b/puic/puic.pro @@ -4,7 +4,7 @@ INCLUDEPATH += . CONFIG += qt warn_on -exists( $(TQTDIR)/lib/libqt-mt* ) { +exists( $(TQTDIR)/lib/libtqt-mt* ) { CONFIG += thread }