diff options
author | Laszlo Papp <lpapp@kde.org> | 2013-01-27 05:11:23 +0000 |
---|---|---|
committer | Laszlo Papp <lpapp@kde.org> | 2013-01-27 17:05:23 +0100 |
commit | b0910f0651507a1dc5f4acfbd0a1c225921d080c (patch) | |
tree | 88d004271e9b5bff702d5e2500a66f52891b238b /src/serialport | |
parent | 6623ce7090138e4169bacdfc0c84cdbfbb78ba77 (diff) |
Make all the file renames and relevant changes
"git log --follow /path/to/the/file/in/question" can be used, for instance, for
the renamed files to get the whole history.
Change-Id: I20da087ca88e2c179a6c3232772fa21575e0aa6a
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src/serialport')
-rw-r--r-- | src/serialport/qserialport-global.h (renamed from src/serialport/serialport-global.h) | 0 | ||||
-rw-r--r-- | src/serialport/qserialport.cpp (renamed from src/serialport/serialport.cpp) | 12 | ||||
-rw-r--r-- | src/serialport/qserialport.h (renamed from src/serialport/serialport.h) | 8 | ||||
-rw-r--r-- | src/serialport/qserialport_p.h (renamed from src/serialport/serialport_p.h) | 2 | ||||
-rw-r--r-- | src/serialport/qserialport_symbian.cpp (renamed from src/serialport/serialport_symbian.cpp) | 2 | ||||
-rw-r--r-- | src/serialport/qserialport_symbian_p.h (renamed from src/serialport/serialport_symbian_p.h) | 2 | ||||
-rw-r--r-- | src/serialport/qserialport_unix.cpp (renamed from src/serialport/serialport_unix.cpp) | 2 | ||||
-rw-r--r-- | src/serialport/qserialport_unix_p.h (renamed from src/serialport/serialport_unix_p.h) | 2 | ||||
-rw-r--r-- | src/serialport/qserialport_win.cpp (renamed from src/serialport/serialport_win.cpp) | 2 | ||||
-rw-r--r-- | src/serialport/qserialport_win_p.h (renamed from src/serialport/serialport_win_p.h) | 4 | ||||
-rw-r--r-- | src/serialport/qserialport_wince.cpp (renamed from src/serialport/serialport_wince.cpp) | 4 | ||||
-rw-r--r-- | src/serialport/qserialportinfo.cpp (renamed from src/serialport/serialportinfo.cpp) | 6 | ||||
-rw-r--r-- | src/serialport/qserialportinfo.h (renamed from src/serialport/serialportinfo.h) | 8 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_mac.cpp (renamed from src/serialport/serialportinfo_mac.cpp) | 4 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_p.h (renamed from src/serialport/serialportinfo_p.h) | 2 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_symbian.cpp (renamed from src/serialport/serialportinfo_symbian.cpp) | 6 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_unix.cpp (renamed from src/serialport/serialportinfo_unix.cpp) | 6 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_win.cpp (renamed from src/serialport/serialportinfo_win.cpp) | 6 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_wince.cpp (renamed from src/serialport/serialportinfo_wince.cpp) | 6 | ||||
-rw-r--r-- | src/serialport/serialport-lib.pri | 38 | ||||
-rw-r--r-- | src/serialport/ttylocker_unix_p.h | 2 |
21 files changed, 62 insertions, 62 deletions
diff --git a/src/serialport/serialport-global.h b/src/serialport/qserialport-global.h index 839650f1..839650f1 100644 --- a/src/serialport/serialport-global.h +++ b/src/serialport/qserialport-global.h diff --git a/src/serialport/serialport.cpp b/src/serialport/qserialport.cpp index 1d0beea4..955eaba4 100644 --- a/src/serialport/serialport.cpp +++ b/src/serialport/qserialport.cpp @@ -42,15 +42,15 @@ ** ****************************************************************************/ -#include "serialport.h" -#include "serialportinfo.h" +#include "qserialport.h" +#include "qserialportinfo.h" #ifdef Q_OS_WIN -#include "serialport_win_p.h" +#include "qserialport_win_p.h" #elif defined (Q_OS_SYMBIAN) -#include "serialport_symbian_p.h" +#include "qserialport_symbian_p.h" #elif defined (Q_OS_UNIX) -#include "serialport_unix_p.h" +#include "qserialport_unix_p.h" #else #error Unsupported OS #endif @@ -1159,6 +1159,6 @@ qint64 QSerialPort::writeData(const char *data, qint64 maxSize) \sa setBreak(), sendBreak() */ -#include "moc_serialport.cpp" +#include "moc_qserialport.cpp" QT_END_NAMESPACE_SERIALPORT diff --git a/src/serialport/serialport.h b/src/serialport/qserialport.h index af1b2dac..68438f3a 100644 --- a/src/serialport/serialport.h +++ b/src/serialport/qserialport.h @@ -40,12 +40,12 @@ ** ****************************************************************************/ -#ifndef QSERIALPORT_H -#define QSERIALPORT_H +#ifndef SERIALPORT_H +#define SERIALPORT_H #include <QtCore/qiodevice.h> -#include "serialport-global.h" +#include "qserialport-global.h" QT_BEGIN_NAMESPACE_SERIALPORT @@ -252,4 +252,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSerialPort::Lines) QT_END_NAMESPACE_SERIALPORT -#endif // QSERIALPORT_H +#endif // SERIALPORT_H diff --git a/src/serialport/serialport_p.h b/src/serialport/qserialport_p.h index caca381e..2528d002 100644 --- a/src/serialport/serialport_p.h +++ b/src/serialport/qserialport_p.h @@ -44,7 +44,7 @@ #ifndef QSERIALPORT_P_H #define QSERIALPORT_P_H -#include "serialport.h" +#include "qserialport.h" #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) #include <private/qringbuffer_p.h> diff --git a/src/serialport/serialport_symbian.cpp b/src/serialport/qserialport_symbian.cpp index 46bf80dd..0cbdc593 100644 --- a/src/serialport/serialport_symbian.cpp +++ b/src/serialport/qserialport_symbian.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "serialport_symbian_p.h" +#include "qserialport_symbian_p.h" #include <e32base.h> //#include <e32test.h> diff --git a/src/serialport/serialport_symbian_p.h b/src/serialport/qserialport_symbian_p.h index ae924fc4..3342357e 100644 --- a/src/serialport/serialport_symbian_p.h +++ b/src/serialport/qserialport_symbian_p.h @@ -42,7 +42,7 @@ #ifndef QSERIALPORT_SYMBIAN_P_H #define QSERIALPORT_SYMBIAN_P_H -#include "serialport_p.h" +#include "qserialport_p.h" #include <c32comm.h> diff --git a/src/serialport/serialport_unix.cpp b/src/serialport/qserialport_unix.cpp index 62976607..23df0f84 100644 --- a/src/serialport/serialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -41,7 +41,7 @@ ** ****************************************************************************/ -#include "serialport_unix_p.h" +#include "qserialport_unix_p.h" #include "ttylocker_unix_p.h" #include <errno.h> diff --git a/src/serialport/serialport_unix_p.h b/src/serialport/qserialport_unix_p.h index 6db5b310..f6570533 100644 --- a/src/serialport/serialport_unix_p.h +++ b/src/serialport/qserialport_unix_p.h @@ -43,7 +43,7 @@ #ifndef QSERIALPORT_UNIX_P_H #define QSERIALPORT_UNIX_P_H -#include "serialport_p.h" +#include "qserialport_p.h" #include <limits.h> #include <termios.h> diff --git a/src/serialport/serialport_win.cpp b/src/serialport/qserialport_win.cpp index 78d9b8d8..5848c1aa 100644 --- a/src/serialport/serialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -41,7 +41,7 @@ ** ****************************************************************************/ -#include "serialport_win_p.h" +#include "qserialport_win_p.h" #ifndef Q_OS_WINCE #include <QtCore/qelapsedtimer.h> diff --git a/src/serialport/serialport_win_p.h b/src/serialport/qserialport_win_p.h index c5492c1b..3376fc84 100644 --- a/src/serialport/serialport_win_p.h +++ b/src/serialport/qserialport_win_p.h @@ -43,7 +43,7 @@ #ifndef QSERIALPORT_WIN_P_H #define QSERIALPORT_WIN_P_H -#include "serialport_p.h" +#include "qserialport_p.h" #include <qt_windows.h> @@ -159,4 +159,4 @@ private: QT_END_NAMESPACE_SERIALPORT -#endif // SERIALPORT_WIN_P_H +#endif // QSERIALPORT_WIN_P_H diff --git a/src/serialport/serialport_wince.cpp b/src/serialport/qserialport_wince.cpp index a19cddf9..4da574d9 100644 --- a/src/serialport/serialport_wince.cpp +++ b/src/serialport/qserialport_wince.cpp @@ -41,7 +41,7 @@ ** ****************************************************************************/ -#include "serialport_win_p.h" +#include "qserialport_win_p.h" #include <QtCore/qelapsedtimer.h> @@ -485,6 +485,6 @@ QString QSerialPortPrivate::portNameFromSystemLocation(const QString &location) return ret; } -#include "serialport_wince.moc" +#include "qserialport_wince.moc" QT_END_NAMESPACE_SERIALPORT diff --git a/src/serialport/serialportinfo.cpp b/src/serialport/qserialportinfo.cpp index 30d7e019..f8afe0a4 100644 --- a/src/serialport/serialportinfo.cpp +++ b/src/serialport/qserialportinfo.cpp @@ -41,9 +41,9 @@ ** ****************************************************************************/ -#include "serialportinfo.h" -#include "serialportinfo_p.h" -#include "serialport.h" +#include "qserialportinfo.h" +#include "qserialportinfo_p.h" +#include "qserialport.h" QT_BEGIN_NAMESPACE_SERIALPORT diff --git a/src/serialport/serialportinfo.h b/src/serialport/qserialportinfo.h index 9d33b33e..a553daa5 100644 --- a/src/serialport/serialportinfo.h +++ b/src/serialport/qserialportinfo.h @@ -40,13 +40,13 @@ ** ****************************************************************************/ -#ifndef SERIALPORTINFO_H -#define SERIALPORTINFO_H +#ifndef QSERIALPORTINFO_H +#define QSERIALPORTINFO_H #include <QtCore/qlist.h> #include <QtCore/qscopedpointer.h> -#include "serialport-global.h" +#include "qserialport-global.h" QT_BEGIN_NAMESPACE_SERIALPORT @@ -90,4 +90,4 @@ inline bool QSerialPortInfo::isNull() const QT_END_NAMESPACE_SERIALPORT -#endif // SERIALPORTINFO_H +#endif // QSERIALPORTINFO_H diff --git a/src/serialport/serialportinfo_mac.cpp b/src/serialport/qserialportinfo_mac.cpp index 60398b3d..32bc9525 100644 --- a/src/serialport/serialportinfo_mac.cpp +++ b/src/serialport/qserialportinfo_mac.cpp @@ -41,8 +41,8 @@ ** ****************************************************************************/ -#include "serialportinfo.h" -#include "serialportinfo_p.h" +#include "qserialportinfo.h" +#include "qserialportinfo_p.h" #include <sys/param.h> diff --git a/src/serialport/serialportinfo_p.h b/src/serialport/qserialportinfo_p.h index b50ba9db..a5f8bba8 100644 --- a/src/serialport/serialportinfo_p.h +++ b/src/serialport/qserialportinfo_p.h @@ -44,7 +44,7 @@ #ifndef QSERIALPORTINFO_P_H #define QSERIALPORTINFO_P_H -#include "serialport-global.h" +#include "qserialport-global.h" #include <QtCore/qstring.h> diff --git a/src/serialport/serialportinfo_symbian.cpp b/src/serialport/qserialportinfo_symbian.cpp index 15561ac8..ab842798 100644 --- a/src/serialport/serialportinfo_symbian.cpp +++ b/src/serialport/qserialportinfo_symbian.cpp @@ -41,9 +41,9 @@ ** ****************************************************************************/ -#include "serialportinfo.h" -#include "serialportinfo_p.h" -#include "serialport_symbian_p.h" +#include "qserialportinfo.h" +#include "qserialportinfo_p.h" +#include "qserialport_symbian_p.h" #include <e32base.h> //#include <e32test.h> diff --git a/src/serialport/serialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp index f85dda63..5a8e5c2d 100644 --- a/src/serialport/serialportinfo_unix.cpp +++ b/src/serialport/qserialportinfo_unix.cpp @@ -41,10 +41,10 @@ ** ****************************************************************************/ -#include "serialportinfo.h" -#include "serialportinfo_p.h" +#include "qserialportinfo.h" +#include "qserialportinfo_p.h" #include "ttylocker_unix_p.h" -#include "serialport_unix_p.h" +#include "qserialport_unix_p.h" #include <QtCore/qfile.h> #ifndef Q_OS_MAC diff --git a/src/serialport/serialportinfo_win.cpp b/src/serialport/qserialportinfo_win.cpp index b7fc2e93..94106f19 100644 --- a/src/serialport/serialportinfo_win.cpp +++ b/src/serialport/qserialportinfo_win.cpp @@ -41,9 +41,9 @@ ** ****************************************************************************/ -#include "serialportinfo.h" -#include "serialportinfo_p.h" -#include "serialport_win_p.h" +#include "qserialportinfo.h" +#include "qserialportinfo_p.h" +#include "qserialport_win_p.h" #ifndef Q_OS_WINCE #include <initguid.h> diff --git a/src/serialport/serialportinfo_wince.cpp b/src/serialport/qserialportinfo_wince.cpp index c77b8069..2b868181 100644 --- a/src/serialport/serialportinfo_wince.cpp +++ b/src/serialport/qserialportinfo_wince.cpp @@ -41,9 +41,9 @@ ** ****************************************************************************/ -#include "serialportinfo.h" -#include "serialportinfo_p.h" -#include "serialport_win_p.h" +#include "qserialportinfo.h" +#include "qserialportinfo_p.h" +#include "qserialport_win_p.h" #include <QtCore/qstringlist.h> diff --git a/src/serialport/serialport-lib.pri b/src/serialport/serialport-lib.pri index 46ed0585..7567665e 100644 --- a/src/serialport/serialport-lib.pri +++ b/src/serialport/serialport-lib.pri @@ -3,32 +3,32 @@ INCLUDEPATH += $$PWD linux*:DEFINES += HAVE_LIBUDEV PUBLIC_HEADERS += \ - $$PWD/serialport-global.h \ - $$PWD/serialport.h \ - $$PWD/serialportinfo.h + $$PWD/qserialport-global.h \ + $$PWD/qserialport.h \ + $$PWD/qserialportinfo.h PRIVATE_HEADERS += \ - $$PWD/serialport_p.h \ - $$PWD/serialportinfo_p.h + $$PWD/qserialport_p.h \ + $$PWD/qserialportinfo_p.h SOURCES += \ - $$PWD/serialport.cpp \ - $$PWD/serialportinfo.cpp + $$PWD/qserialport.cpp \ + $$PWD/qserialportinfo.cpp win32 { PRIVATE_HEADERS += \ - $$PWD/serialport_win_p.h + $$PWD/qserialport_win_p.h SOURCES += \ - $$PWD/serialport_win.cpp \ - $$PWD/serialportinfo_win.cpp + $$PWD/qserialport_win.cpp \ + $$PWD/qserialportinfo_win.cpp !wince*: { LIBS += -lsetupapi -ladvapi32 } else { SOURCES += \ - $$PWD/serialport_wince.cpp \ - $$PWD/serialportinfo_wince.cpp + $$PWD/qserialport_wince.cpp \ + $$PWD/qserialportinfo_wince.cpp } } @@ -47,11 +47,11 @@ symbian { INCLUDEPATH += c:/QtSDK/Symbian/SDKs/Symbian3Qt473/epoc32/include/platform PRIVATE_HEADERS += \ - $$PWD/serialport_symbian_p.h + $$PWD/qserialport_symbian_p.h SOURCES += \ - $$PWD/serialport_symbian.cpp \ - $$PWD/serialportinfo_symbian.cpp + $$PWD/qserialport_symbian.cpp \ + $$PWD/qserialportinfo_symbian.cpp LIBS += -leuser -lefsrv -lc32 } @@ -59,15 +59,15 @@ symbian { unix:!symbian { PRIVATE_HEADERS += \ $$PWD/ttylocker_unix_p.h \ - $$PWD/serialport_unix_p.h + $$PWD/qserialport_unix_p.h SOURCES += \ $$PWD/ttylocker_unix.cpp \ - $$PWD/serialport_unix.cpp \ - $$PWD/serialportinfo_unix.cpp + $$PWD/qserialport_unix.cpp \ + $$PWD/qserialportinfo_unix.cpp macx { - SOURCES += $$PWD/serialportinfo_mac.cpp + SOURCES += $$PWD/qserialportinfo_mac.cpp LIBS += -framework IOKit -framework CoreFoundation } else { diff --git a/src/serialport/ttylocker_unix_p.h b/src/serialport/ttylocker_unix_p.h index e5c47f56..2aca6328 100644 --- a/src/serialport/ttylocker_unix_p.h +++ b/src/serialport/ttylocker_unix_p.h @@ -42,7 +42,7 @@ #ifndef TTYLOCKER_UNIX_P_H #define TTYLOCKER_UNIX_P_H -#include "serialport-global.h" +#include "qserialport-global.h" QT_BEGIN_NAMESPACE_SERIALPORT |