diff options
| author | Laszlo Papp <lpapp@kde.org> | 2013-02-07 12:04:55 +0000 |
|---|---|---|
| committer | Laszlo Papp <lpapp@kde.org> | 2013-02-07 16:16:24 +0100 |
| commit | 6a19f9af432975cd3a354c466b1511b4a34b907c (patch) | |
| tree | e2ee8df1ecffd53402ac3aab8fefb877b3814d95 /src/serialport/qserialportinfo_unix.cpp | |
| parent | bfebe1c71082e38f9437f7091abbe9261ed0e447 (diff) | |
Rename the TtyLocker class to QTtyLocker as it gets to Qt scope
Change-Id: I74b90ec2a6cb08a9bc75225e04995a3b05f2c6e9
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src/serialport/qserialportinfo_unix.cpp')
| -rw-r--r-- | src/serialport/qserialportinfo_unix.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp index 3c5205c3..4b161446 100644 --- a/src/serialport/qserialportinfo_unix.cpp +++ b/src/serialport/qserialportinfo_unix.cpp @@ -43,7 +43,7 @@ #include "qserialportinfo.h" #include "qserialportinfo_p.h" -#include "ttylocker_unix_p.h" +#include "qttylocker_unix_p.h" #include "qserialport_unix_p.h" #include <QtCore/qfile.h> @@ -246,7 +246,7 @@ QList<qint32> QSerialPortInfo::standardBaudRates() bool QSerialPortInfo::isBusy() const { bool currentPid = false; - return TtyLocker::isLocked(portName().toLocal8Bit().constData(), ¤tPid); + return QTtyLocker::isLocked(portName().toLocal8Bit().constData(), ¤tPid); } bool QSerialPortInfo::isValid() const |