summaryrefslogtreecommitdiffstats
path: root/src/common/port/parallel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/common/port/parallel.cpp')
-rw-r--r--src/common/port/parallel.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/common/port/parallel.cpp b/src/common/port/parallel.cpp
index daa0c6a..3d92ae0 100644
--- a/src/common/port/parallel.cpp
+++ b/src/common/port/parallel.cpp
@@ -59,12 +59,12 @@ TQStringList Port::Parallel::deviceList()
TQStringList list;
#if defined(HAVE_PPDEV)
// standard parport in user space
- for(int i = 0; i<8; ++i) list.append(TQString("/dev/parport%1").tqarg(i));
+ for(int i = 0; i<8; ++i) list.append(TQString("/dev/parport%1").arg(i));
// new devfs parport flavour
- for(int i = 0; i<8; ++i) list.append(TQString("/dev/parports/%1").tqarg(i));
+ for(int i = 0; i<8; ++i) list.append(TQString("/dev/parports/%1").arg(i));
#elif defined(HAVE_PPBUS)
// FreeBSD
- for(int i = 0; i<8; ++i) list.append(TQString("/dev/ppi%1").tqarg(i));
+ for(int i = 0; i<8; ++i) list.append(TQString("/dev/ppi%1").arg(i));
#endif
return list;
}
@@ -100,12 +100,12 @@ const Port::Parallel::PPinData Port::Parallel::PIN_DATA[Nb_Pins] = {
{ Data, 0x20, Out, "D5" }, // data 5
{ Data, 0x40, Out, "D6" }, // data 6
{ Data, 0x80, Out, "D7" }, // data 7
- { tqStatus, 0x40, In, "/ACK" }, // !ack
- { tqStatus, 0x80, In, "BUSY" }, // busy
- { tqStatus, 0x20, In, "PAPER" }, // pout
- { tqStatus, 0x10, In, "SELin" }, // select
+ { Status, 0x40, In, "/ACK" }, // !ack
+ { Status, 0x80, In, "BUSY" }, // busy
+ { Status, 0x20, In, "PAPER" }, // pout
+ { Status, 0x10, In, "SELin" }, // select
{ Control, 0x02, Out, "LF" }, // !feed
- { tqStatus, 0x08, In, "/ERROR" }, // !error
+ { Status, 0x08, In, "/ERROR" }, // !error
{ Control, 0x04, Out, "PRIME" }, // !init
{ Control, 0x08, Out, "SELout" }, // !si
{ Nb_RequestTypes, 0x00, NoIO, "GND" }, // GND
@@ -166,17 +166,17 @@ bool Port::Parallel::internalOpen()
#if defined(HAVE_PPDEV)
_fd = ::open(_device.latin1(), O_RDWR);
if ( _fd<0 ) {
- setSystemError(i18n("Could not open device \"%1\"").tqarg(_device));
+ setSystemError(i18n("Could not open device \"%1\"").arg(_device));
return false;
}
if ( ioctl(_fd, PPCLAIM)<0 ) {
- setSystemError(i18n("Could not claim device \"%1\": check it is read/write enabled").tqarg(_device));
+ setSystemError(i18n("Could not claim device \"%1\": check it is read/write enabled").arg(_device));
return false;
}
#elif defined(HAVE_PPBUS)
_fd = ::open(_device.latin1(), O_RDWR);
if ( _fd<0 ) {
- setSystemError(i18n("Could not open device \"%1\"").tqarg(_device));
+ setSystemError(i18n("Could not open device \"%1\"").arg(_device));
return false;
}
#endif
@@ -208,7 +208,7 @@ bool Port::Parallel::setPinOn(uint pin, bool on, LogicType type)
int request = REQUEST_DATA[rtype].write;
Q_ASSERT( request!=0 );
if ( ioctl(_fd, request, &c)<0 ) {
- setSystemError(i18n("Error setting pin %1 to %2").tqarg(PIN_DATA[pin].label).tqarg(on));
+ setSystemError(i18n("Error setting pin %1 to %2").arg(PIN_DATA[pin].label).arg(on));
return false;
}
_images[rtype] = c;
@@ -228,7 +228,7 @@ bool Port::Parallel::readPin(uint pin, LogicType type, bool &value)
Q_ASSERT( request!=0 );
uchar c = 0;
if ( ioctl(_fd, request, &c)<0 ) {
- setSystemError(i18n("Error reading bit on pin %1").tqarg(PIN_DATA[pin].label));
+ setSystemError(i18n("Error reading bit on pin %1").arg(PIN_DATA[pin].label));
return false;
}
_images[rtype] = c;
@@ -240,7 +240,7 @@ bool Port::Parallel::readPin(uint pin, LogicType type, bool &value)
void Port::Parallel::setSystemError(const TQString &message)
{
#if defined(HAVE_PPDEV) || defined(HAVE_PPBUS)
- log(Log::LineType::Error, message + TQString(" (errno=%1).").tqarg(strerror(errno)));
+ log(Log::LineType::Error, message + TQString(" (errno=%1).").arg(strerror(errno)));
#else
Q_UNUSED(message);
#endif