From 4fb897b216c41c13f128c71bcc66f60e2dc601c4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:33:40 -0600 Subject: Rename additional global TQt functions --- kinit/kinit.cpp | 8 ++++---- kinit/klauncher.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kinit') diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp index 6859282d3..95c1510cb 100644 --- a/kinit/kinit.cpp +++ b/kinit/kinit.cpp @@ -1545,7 +1545,7 @@ int tdeinit_xio_errhandler( Display *disp ) // disp is 0L when KDE shuts down. We don't want those warnings then. if ( disp ) - qWarning( "tdeinit: Fatal IO error: client killed" ); + tqWarning( "tdeinit: Fatal IO error: client killed" ); if (sock_file[0]) { @@ -1567,7 +1567,7 @@ int tdeinit_xio_errhandler( Display *disp ) } if ( disp ) - qWarning( "tdeinit: sending SIGHUP to children." ); + tqWarning( "tdeinit: sending SIGHUP to children." ); /* this should remove all children we started */ signal(SIGHUP, SIG_IGN); @@ -1576,14 +1576,14 @@ int tdeinit_xio_errhandler( Display *disp ) sleep(2); if ( disp ) - qWarning( "tdeinit: sending SIGTERM to children." ); + tqWarning( "tdeinit: sending SIGTERM to children." ); /* and if they don't listen to us, this should work */ signal(SIGTERM, SIG_IGN); kill(0, SIGTERM); if ( disp ) - qWarning( "tdeinit: Exit." ); + tqWarning( "tdeinit: Exit." ); exit( 0 ); return 0; diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp index 69a2e10d2..ab9bd063f 100644 --- a/kinit/klauncher.cpp +++ b/kinit/klauncher.cpp @@ -186,7 +186,7 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup) if (domainname.status() != 0) { // Sever error! - qDebug("KLauncher: Fatal error, can't create tempfile!"); + tqDebug("KLauncher: Fatal error, can't create tempfile!"); ::exit(1); } mPoolSocketName = domainname.name(); @@ -210,13 +210,13 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup) mSlaveDebug = getenv("KDE_SLAVE_DEBUG_WAIT"); if (!mSlaveDebug.isEmpty()) { - qWarning("Klauncher running in slave-debug mode for slaves of protocol '%s'", mSlaveDebug.data()); + tqWarning("Klauncher running in slave-debug mode for slaves of protocol '%s'", mSlaveDebug.data()); } mSlaveValgrind = getenv("KDE_SLAVE_VALGRIND"); if (!mSlaveValgrind.isEmpty()) { mSlaveValgrindSkin = getenv("KDE_SLAVE_VALGRIND_SKIN"); - qWarning("Klauncher running slaves through valgrind for slaves of protocol '%s'", mSlaveValgrind.data()); + tqWarning("Klauncher running slaves through valgrind for slaves of protocol '%s'", mSlaveValgrind.data()); } klauncher_header request_header; request_header.cmd = LAUNCHER_OK; -- cgit v1.2.1