From 50087701ab4e8f67501bc90351298acd308049ab Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 27 Sep 2018 14:18:52 +0900 Subject: [PATCH] qt -> tqt conversion: qtlib -> tqtlib libqt -> libtqt QTLIB -> TQTLIB LIBQT -> LIBTQT Signed-off-by: Michele Calgaro --- config.h.cmake | 2 +- dcop/Makefile.am | 2 +- tdecore/Makefile.am | 2 +- tdecore/network/Makefile.am | 2 +- tdefx/Makefile.am | 2 +- tdeinit/README | 4 ++-- tdesu/Makefile.am | 2 +- tdeui/Makefile.am | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config.h.cmake b/config.h.cmake index b65b1253f..900f32bfc 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -353,7 +353,7 @@ #undef HAVE_LIBPTHREAD /* Define to 1 if you have the `qt-mt' library (-lqt-mt). */ -#undef HAVE_LIBQT_MT +#undef HAVE_LIBTQT_MT /* Defined if you have libthai and want to have it compiled in */ #undef HAVE_LIBTHAI diff --git a/dcop/Makefile.am b/dcop/Makefile.am index 65799391d..e80c0887a 100644 --- a/dcop/Makefile.am +++ b/dcop/Makefile.am @@ -33,7 +33,7 @@ lib_LTLIBRARIES = libDCOP.la libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_TQT) libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(all_libraries) libDCOP_la_NMCHECK = $(srcdir)/libDCOP.nmcheck -libDCOP_la_NMCHECKWEAK = $(srcdir)/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck +libDCOP_la_NMCHECKWEAK = $(srcdir)/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libtqt-mt_weak.nmcheck include_HEADERS = dcopclient.h dcopobject.h dcopstub.h dcopref.h dcoptypes.h kdatastream.h noinst_HEADERS = version.h dcopglobal.h dcopserver.h testdcop.h dcopsignals.h dcop-path.h diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am index 3d267eb96..58e74a010 100644 --- a/tdecore/Makefile.am +++ b/tdecore/Makefile.am @@ -125,7 +125,7 @@ libtdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS libtdecore_la_LIBADD = malloc/libklmalloc.la network/libtdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la \ $(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/tdefx/libtdefx.la $(LIB_TQT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL) libtdecore_la_NMCHECK = $(srcdir)/libtdecore.nmcheck -libtdecore_la_NMCHECKWEAK = $(srcdir)/libtdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \ +libtdecore_la_NMCHECKWEAK = $(srcdir)/libtdecore_weak.nmcheck $(srcdir)/libtqt-mt_weak.nmcheck \ $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/standard_weak.nmcheck libtdecore_la_METASOURCES = AUTO diff --git a/tdecore/network/Makefile.am b/tdecore/network/Makefile.am index 621e5fab2..08f698b90 100644 --- a/tdecore/network/Makefile.am +++ b/tdecore/network/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am for libqt-addon +## Makefile.am for libtqt-addon # this is the program that gets installed. it's name is used for all # of the other Makefile.am variables diff --git a/tdefx/Makefile.am b/tdefx/Makefile.am index b77b82921..8e02e8587 100644 --- a/tdefx/Makefile.am +++ b/tdefx/Makefile.am @@ -26,7 +26,7 @@ lib_LTLIBRARIES = libtdefx.la libtdefx_la_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(all_libraries) -no-undefined -version-info 6:0:2 libtdefx_la_LIBADD = $(LIB_TQT) $(LIB_XRENDER) $(LIB_X11) libtdefx_la_NMCHECK = $(srcdir)/libtdefx.nmcheck -libtdefx_la_NMCHECKWEAK = $(srcdir)/libtdefx_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck \ +libtdefx_la_NMCHECKWEAK = $(srcdir)/libtdefx_weak.nmcheck $(top_srcdir)/tdecore/libtqt-mt_weak.nmcheck \ $(top_srcdir)/tdecore/standard_weak.nmcheck include_HEADERS = kpixmap.h kpixmapsplitter.h \ diff --git a/tdeinit/README b/tdeinit/README index e70caab34..c83f2b687 100644 --- a/tdeinit/README +++ b/tdeinit/README @@ -29,7 +29,7 @@ it uses need to be linked. Startup Speed ============= -Starting an application linked against libqt, libtdecore and libtdeui +Starting an application linked against libtqt, libtdecore and libtdeui in the conventional way takes approx. 150ms on a Pentium III - 500Mhz. Starting the same application via tdeinit takes less than 10ms. @@ -39,7 +39,7 @@ constructor requires an extra 100ms in both cases) Memory Usage ============ -An application linked against libqt, libtdecore and libtdeui started +An application linked against libtqt, libtdecore and libtdeui started in the conventional way requires about 498Kb memory. (average of 10 instances) If the same application is started via tdeinit it requires about 142Kb. A difference of 356Kb (application diff --git a/tdesu/Makefile.am b/tdesu/Makefile.am index 974c7020d..247c9c3cf 100644 --- a/tdesu/Makefile.am +++ b/tdesu/Makefile.am @@ -8,7 +8,7 @@ libtdesu_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) libtdesu_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la libtdesu_la_NMCHECK = $(srcdir)/libtdesu.nmcheck libtdesu_la_NMCHECKWEAK = $(srcdir)/libtdesu_weak.nmcheck $(top_srcdir)/tdecore/libtdecore_weak.nmcheck \ - $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck + $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libtqt-mt_weak.nmcheck tdesudir = $(includedir)/tdesu tdesu_HEADERS = defaults.h client.h process.h tdesu_pty.h kcookie.h su.h ssh.h stub.h diff --git a/tdeui/Makefile.am b/tdeui/Makefile.am index 8aa95db98..556277cb9 100644 --- a/tdeui/Makefile.am +++ b/tdeui/Makefile.am @@ -136,7 +136,7 @@ scriptsdir = $(kde_bindir) libtdeui_la_METASOURCES = AUTO libtdeui_la_NMCHECK = $(srcdir)/libtdeui.nmcheck libtdeui_la_NMCHECKWEAK = $(srcdir)/libtdeui_weak.nmcheck $(top_srcdir)/tdecore/libtdecore_weak.nmcheck \ - $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck + $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libtqt-mt_weak.nmcheck rcdir = $(kde_confdir)/ui rc_DATA = ui_standards.rc