From 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:50:21 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kandy/src/modem.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'kandy/src/modem.cpp') diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp index 3956376a..a7d24695 100644 --- a/kandy/src/modem.cpp +++ b/kandy/src/modem.cpp @@ -194,9 +194,9 @@ bool Modem::open() TQCString dev = TQFile::encodeName( (*prefs).serialDevice() ); const char *fdev = dev.data(); if ( ( fd = ::open( fdev, O_RDWR | O_NOCTTY | O_NONBLOCK ) ) == -1 ) { - emit errorMessage( i18n( "Unable to open tqdevice '%1'. " + emit errorMessage( i18n( "Unable to open device '%1'. " "Please check that you have sufficient permissions." ) - .tqarg( fdev ) ); + .arg( fdev ) ); return false; } @@ -204,7 +204,7 @@ bool Modem::open() if ( tcgetattr( fd, &init_tty ) == -1 ) { int errnumber = errno; emit errorMessage( i18n( "Communication setup failed (tcgetattr code: %1)" ) - .tqarg(strerror(errnumber)) ); + .arg(strerror(errnumber)) ); ::close( fd ); fd = 0; return false; @@ -279,7 +279,7 @@ bool Modem::lockDevice() #ifdef HAVE_LOCKDEV is_locked = !dev_lock( (*prefs).serialDevice().local8Bit() ); if (!is_locked) - emit errorMessage( i18n( "Unable to lock tqdevice '%1'." ).tqarg( + emit errorMessage( i18n( "Unable to lock device '%1'." ).arg( (*prefs).serialDevice() )); return is_locked; #else @@ -299,7 +299,7 @@ bool Modem::lockDevice() if ( ( lfd = ::open( TQFile::encodeName( fileName ), O_RDONLY ) ) < 0 ) { emit errorMessage( i18n( "Unable to open lock file '%1'.") - .tqarg( fileName ) ); + .arg( fileName ) ); return false; } @@ -307,7 +307,7 @@ bool Modem::lockDevice() if ( count < 0 ) { emit errorMessage( i18n( "Unable to read lock file '%1'.") - .tqarg( fileName ) ); + .arg( fileName ) ); ::close( lfd ); return false; } @@ -317,13 +317,13 @@ bool Modem::lockDevice() count = sscanf( buf, "%d", &pid ); if ( ( count != 1 ) || ( pid <= 0 ) ) { emit errorMessage( i18n( "Unable to get PID from file '%1'.") - .tqarg( fileName ) ); + .arg( fileName ) ); return false; } if ( !kill( (pid_t) pid, 0 ) ) { - emit errorMessage( i18n( "Process with PID %1, which is locking the tqdevice, is still running.") - .tqarg( pid ) ); + emit errorMessage( i18n( "Process with PID %1, which is locking the device, is still running.") + .arg( pid ) ); return false; } @@ -336,7 +336,7 @@ bool Modem::lockDevice() if ( ( lfd = creat( TQFile::encodeName( fileName ).data(), 0644 ) ) == -1 ) { emit errorMessage( i18n( "Unable to create lock file '%1'. " "Please check that you have sufficient permissions.") - .tqarg( fileName ) ); + .arg( fileName ) ); return false; } -- cgit v1.2.3