From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 14 Apr 2011 20:16:30 +0000
Subject: Enable kdepim compilation under Qt4 This will likely break Qt3
 compilation temporarily, which is an unintended side effect. A third and
 final kdepim commit will repair Qt3 compilation shortly.

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kandy/src/modem.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'kandy/src/modem.cpp')

diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp
index 4b085de6a..113f2e4bc 100644
--- a/kandy/src/modem.cpp
+++ b/kandy/src/modem.cpp
@@ -196,7 +196,7 @@ bool Modem::open()
   if ( ( fd = ::open( fdev, O_RDWR | O_NOCTTY | O_NONBLOCK ) ) == -1 ) {
     emit errorMessage( i18n( "Unable to open tqdevice '%1'. "
                              "Please check that you have sufficient permissions." )
-                             .arg( fdev ) );
+                             .tqarg( 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)" )
-        .arg(strerror(errnumber)) );
+        .tqarg(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'." ).arg(
+      emit errorMessage( i18n( "Unable to lock tqdevice '%1'." ).tqarg(
                              (*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'.")
-                               .arg( fileName ) );
+                               .tqarg( fileName ) );
       return false;
     }
 
@@ -307,7 +307,7 @@ bool Modem::lockDevice()
 
     if ( count < 0 ) {
        emit errorMessage( i18n( "Unable to read lock file '%1'.")
-                                .arg( fileName ) );
+                                .tqarg( 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'.")
-                                .arg( fileName ) );
+                                .tqarg( fileName ) );
        return false;
     }
 
     if ( !kill( (pid_t) pid, 0 ) ) {
        emit errorMessage( i18n( "Process with PID %1, which is locking the tqdevice, is still running.")
-                                .arg( pid ) );
+                                .tqarg( 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.")
-                             .arg( fileName ) );
+                             .tqarg( fileName ) );
     return false;
   }
 
-- 
cgit v1.2.1