Call the module QtSerialPort instead of QtAddOnSerialPort

Use the QTSERIALPORT as a term for internal variables as well to remain
consistent with the freshly chosen module name.

Change-Id: Ia780b105649b39a1eca46702466da5bc31ec5af0
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>

35 files changed, 57 insertions, 60 deletions

diff --git a/examples/blockingmaster/dialog.cpp b/examples/blockingmaster/dialog.cpp
index e28f04dd..2e432cf2 100644
--- a/examples/blockingmaster/dialog.cpp
+++ b/examples/blockingmaster/dialog.cpp
@@ -48,7 +48,7 @@
 #include <QPushButton>
 #include <QGridLayout>
 
-#include <QtAddOnSerialPort/serialportinfo.h>
+#include <QtSerialPort/serialportinfo.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
diff --git a/examples/blockingmaster/masterthread.cpp b/examples/blockingmaster/masterthread.cpp
index 02a628c3..621d0189 100644
--- a/examples/blockingmaster/masterthread.cpp
+++ b/examples/blockingmaster/masterthread.cpp
@@ -41,7 +41,7 @@
 
 #include "masterthread.h"
 
-#include <QtAddOnSerialPort/serialport.h>
+#include <QtSerialPort/serialport.h>
 
 #include <QTime>
 
diff --git a/examples/blockingslave/dialog.cpp b/examples/blockingslave/dialog.cpp
index c9d99404..38a5fd58 100644
--- a/examples/blockingslave/dialog.cpp
+++ b/examples/blockingslave/dialog.cpp
@@ -48,7 +48,7 @@
 #include <QPushButton>
 #include <QGridLayout>
 
-#include <QtAddOnSerialPort/serialportinfo.h>
+#include <QtSerialPort/serialportinfo.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
diff --git a/examples/blockingslave/slavethread.cpp b/examples/blockingslave/slavethread.cpp
index 2e23821f..7f84f94a 100644
--- a/examples/blockingslave/slavethread.cpp
+++ b/examples/blockingslave/slavethread.cpp
@@ -41,7 +41,7 @@
 
 #include "slavethread.h"
 
-#include <QtAddOnSerialPort/serialport.h>
+#include <QtSerialPort/serialport.h>
 
 #include <QTime>
 
diff --git a/examples/cenumerator/main.cpp b/examples/cenumerator/main.cpp
index 1257fcc4..8d03c98e 100644
--- a/examples/cenumerator/main.cpp
+++ b/examples/cenumerator/main.cpp
@@ -41,7 +41,7 @@
 
 #include <QTextStream>
 #include <QCoreApplication>
-#include <QtAddOnSerialPort/serialportinfo.h>
+#include <QtSerialPort/serialportinfo.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
diff --git a/examples/doc/blockingmaster.qdoc b/examples/doc/blockingmaster.qdoc
index 8a0abfdc..9f723b92 100644
--- a/examples/doc/blockingmaster.qdoc
+++ b/examples/doc/blockingmaster.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \module QtAddonSerialPort
+    \module QtSerialPort
     \title Blocking Master example
     \example examples/blockingmaster
 
diff --git a/examples/doc/blockingslave.qdoc b/examples/doc/blockingslave.qdoc
index 810a8ef4..06514978 100644
--- a/examples/doc/blockingslave.qdoc
+++ b/examples/doc/blockingslave.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \module QtAddonSerialPort
+    \module QtSerialPort
     \title Blocking Slave example
     \example examples/blockingslave
 
diff --git a/examples/doc/cenumerator.qdoc b/examples/doc/cenumerator.qdoc
index 60b229b2..1751f47a 100644
--- a/examples/doc/cenumerator.qdoc
+++ b/examples/doc/cenumerator.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \module QtAddonSerialPort
+    \module QtSerialPort
     \title Command Line Enumerator example
     \example examples/cenumerator
 
diff --git a/examples/doc/enumerator.qdoc b/examples/doc/enumerator.qdoc
index c344d579..720ecb72 100644
--- a/examples/doc/enumerator.qdoc
+++ b/examples/doc/enumerator.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \module QtAddonSerialPort
+    \module QtSerialPort
     \title Enumerator example
     \example examples/enumerator
 
diff --git a/examples/doc/terminal.qdoc b/examples/doc/terminal.qdoc
index 78c12b11..99fe7669 100644
--- a/examples/doc/terminal.qdoc
+++ b/examples/doc/terminal.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \module QtAddonSerialPort
+    \module QtSerialPort
     \title Terminal example
     \example examples/terminal
 
diff --git a/examples/enumerator/main.cpp b/examples/enumerator/main.cpp
index d8a07d80..6b1df3e7 100644
--- a/examples/enumerator/main.cpp
+++ b/examples/enumerator/main.cpp
@@ -44,7 +44,7 @@
 #include <QWidget>
 #include <QVBoxLayout>
 #include <QLabel>
-#include <QtAddOnSerialPort/serialportinfo.h>
+#include <QtSerialPort/serialportinfo.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
diff --git a/examples/examples.qdoc b/examples/examples.qdoc
index 4ea0505d..b7ebc361 100644
--- a/examples/examples.qdoc
+++ b/examples/examples.qdoc
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 /*!
-    \module QtAddonSerialPort
+    \module QtSerialPort
     \title Examples
     \page examples.html
     \previouspage Building and usage
diff --git a/examples/master/dialog.cpp b/examples/master/dialog.cpp
index e9e7fefd..1cffaeca 100644
--- a/examples/master/dialog.cpp
+++ b/examples/master/dialog.cpp
@@ -48,7 +48,7 @@
 #include <QPushButton>
 #include <QGridLayout>
 
-#include <QtAddOnSerialPort/serialportinfo.h>
+#include <QtSerialPort/serialportinfo.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
diff --git a/examples/master/dialog.h b/examples/master/dialog.h
index f821b123..db97c76b 100644
--- a/examples/master/dialog.h
+++ b/examples/master/dialog.h
@@ -45,7 +45,7 @@
 #include <QDialog>
 #include <QTimer>
 
-#include <QtAddOnSerialPort/serialport.h>
+#include <QtSerialPort/serialport.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
diff --git a/examples/slave/dialog.cpp b/examples/slave/dialog.cpp
index e3130cfe..1c7c7c8b 100644
--- a/examples/slave/dialog.cpp
+++ b/examples/slave/dialog.cpp
@@ -48,7 +48,7 @@
 #include <QPushButton>
 #include <QGridLayout>
 
-#include <QtAddOnSerialPort/serialportinfo.h>
+#include <QtSerialPort/serialportinfo.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
diff --git a/examples/slave/dialog.h b/examples/slave/dialog.h
index 375532ff..9dd036c5 100644
--- a/examples/slave/dialog.h
+++ b/examples/slave/dialog.h
@@ -45,7 +45,7 @@
 #include <QDialog>
 #include <QTimer>
 
-#include <QtAddOnSerialPort/serialport.h>
+#include <QtSerialPort/serialport.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
diff --git a/examples/slave/slavethread.cpp b/examples/slave/slavethread.cpp
index 7d2bfa24..fd8eba51 100644
--- a/examples/slave/slavethread.cpp
+++ b/examples/slave/slavethread.cpp
@@ -41,7 +41,7 @@
 
 #include "slavethread.h"
 
-#include <QtAddOnSerialPort/serialport.h>
+#include <QtSerialPort/serialport.h>
 
 #include <QTime>
 
diff --git a/examples/terminal/mainwindow.cpp b/examples/terminal/mainwindow.cpp
index db2966f5..6272d369 100644
--- a/examples/terminal/mainwindow.cpp
+++ b/examples/terminal/mainwindow.cpp
@@ -46,7 +46,7 @@
 #include "settingsdialog.h"
 
 #include <QMessageBox>
-#include <QtAddOnSerialPort/serialport.h>
+#include <QtSerialPort/serialport.h>
 
 //! [0]
 MainWindow::MainWindow(QWidget *parent) :
diff --git a/examples/terminal/mainwindow.h b/examples/terminal/mainwindow.h
index 90615cd6..0a699744 100644
--- a/examples/terminal/mainwindow.h
+++ b/examples/terminal/mainwindow.h
@@ -47,7 +47,7 @@
 
 #include <QMainWindow>
 
-#include <QtAddOnSerialPort/serialport-global.h>
+#include <QtSerialPort/serialport-global.h>
 
 namespace Ui {
 class MainWindow;
diff --git a/examples/terminal/settingsdialog.cpp b/examples/terminal/settingsdialog.cpp
index 1eaae3e0..e11447d9 100644
--- a/examples/terminal/settingsdialog.cpp
+++ b/examples/terminal/settingsdialog.cpp
@@ -43,7 +43,7 @@
 #include "settingsdialog.h"
 #include "ui_settingsdialog.h"
 
-#include <QtAddOnSerialPort/serialportinfo.h>
+#include <QtSerialPort/serialportinfo.h>
 #include <QIntValidator>
 #include <QLineEdit>
 
diff --git a/examples/terminal/settingsdialog.h b/examples/terminal/settingsdialog.h
index d815bcca..242a47a7 100644
--- a/examples/terminal/settingsdialog.h
+++ b/examples/terminal/settingsdialog.h
@@ -44,7 +44,7 @@
 #define SETTINGSDIALOG_H
 
 #include <QDialog>
-#include <QtAddOnSerialPort/serialport.h>
+#include <QtSerialPort/serialport.h>
 
 namespace Ui {
 class SettingsDialog;
diff --git a/qtserialport.pro b/qtserialport.pro
index 98e7303a..445fe180 100644
--- a/qtserialport.pro
+++ b/qtserialport.pro
@@ -3,9 +3,9 @@ lessThan(QT_MAJOR_VERSION, 5) {
     SUBDIRS = src examples tests
     CONFIG += ordered
 
-    !infile($$OUT_PWD/.qmake.cache, SERIALPORT_PROJECT_ROOT) {
-        system("echo SERIALPORT_PROJECT_ROOT = $$PWD >> $$OUT_PWD/.qmake.cache")
-        system("echo SERIALPORT_BUILD_ROOT = $$OUT_PWD >> $$OUT_PWD/.qmake.cache")
+    !infile($$OUT_PWD/.qmake.cache, QTSERIALPORT_PROJECT_ROOT) {
+        system("echo QTSERIALPORT_PROJECT_ROOT = $$PWD >> $$OUT_PWD/.qmake.cache")
+        system("echo QTSERIALPORT_BUILD_ROOT = $$OUT_PWD >> $$OUT_PWD/.qmake.cache")
     }
 } else {
     load(qt_parts)
diff --git a/src/serialport/doc/src/build.qdoc b/src/serialport/doc/src/build.qdoc
index 127dc536..0cdf7986 100644
--- a/src/serialport/doc/src/build.qdoc
+++ b/src/serialport/doc/src/build.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \module QtAddonSerialPort
+    \module QtSerialPort
     \title Building and usage
     \page build.html
     \previouspage Get source
diff --git a/src/serialport/doc/src/getsrc.qdoc b/src/serialport/doc/src/getsrc.qdoc
index 8fcab959..92e3ef69 100644
--- a/src/serialport/doc/src/getsrc.qdoc
+++ b/src/serialport/doc/src/getsrc.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \module QtAddonSerialPort
+    \module QtSerialPort
     \title Get source
     \page getsrc.html
     \previouspage Introduction
diff --git a/src/serialport/doc/src/index.qdoc b/src/serialport/doc/src/index.qdoc
index e2908043..f6b5d1a2 100644
--- a/src/serialport/doc/src/index.qdoc
+++ b/src/serialport/doc/src/index.qdoc
@@ -26,18 +26,18 @@
 ****************************************************************************/
 
 /*!
-    \module QtAddonSerialPort
-    \title Qt Addon SerialPort Reference Documentation
+    \module QtSerialPort
+    \title QtSerialPort Reference Documentation
     \page index.html
 
-    \brief The QtAddonSerialPort module provides classes to make serial programming
+    \brief The QtSerialPort module provides classes to make serial programming
     easier and portable.
 
     To include the definitions of the module's classes, use the
     following directive:
 
     \code
-    #include <QtAddOnSerialPort/QtAddOnSerialPort>
+    #include <QtSerialPort/QtSerialPort>
     \endcode
 
     To link against the module, add this line to your \l qmake \c
diff --git a/src/serialport/doc/src/intro.qdoc b/src/serialport/doc/src/intro.qdoc
index b8d71457..dbb30e5d 100644
--- a/src/serialport/doc/src/intro.qdoc
+++ b/src/serialport/doc/src/intro.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \module QtAddonSerialPort
+    \module QtSerialPort
     \title Introduction
     \page intro.html
     \contentspage {Introduction} {Contents}
diff --git a/src/serialport/qt4support/install-helper.pri b/src/serialport/qt4support/install-helper.pri
index 7acc26c0..179e5b2d 100644
--- a/src/serialport/qt4support/install-helper.pri
+++ b/src/serialport/qt4support/install-helper.pri
@@ -1,18 +1,18 @@
-SERIALPORT_PROJECT_INCLUDEDIR = $$SERIALPORT_BUILD_ROOT/include/QtAddOnSerialPort
-SERIALPORT_PROJECT_INCLUDEDIR ~=s,/,$$QMAKE_DIR_SEP,
+QTSERIALPORT_PROJECT_INCLUDEDIR = $$QTSERIALPORT_BUILD_ROOT/include/QtSerialPort
+QTSERIALPORT_PROJECT_INCLUDEDIR ~=s,/,$$QMAKE_DIR_SEP,
 
-system("$$QMAKE_MKDIR $$SERIALPORT_PROJECT_INCLUDEDIR")
+system("$$QMAKE_MKDIR $$QTSERIALPORT_PROJECT_INCLUDEDIR")
 
 for(header_file, PUBLIC_HEADERS) {
    header_file ~=s,/,$$QMAKE_DIR_SEP,
-   system("$$QMAKE_COPY \"$${header_file}\" \"$$SERIALPORT_PROJECT_INCLUDEDIR\"")
+   system("$$QMAKE_COPY \"$${header_file}\" \"$$QTSERIALPORT_PROJECT_INCLUDEDIR\"")
 }
 
 target_headers.files  = $$PUBLIC_HEADERS
-target_headers.path   = $$[QT_INSTALL_PREFIX]/include/QtAddOnSerialPort
+target_headers.path   = $$[QT_INSTALL_PREFIX]/include/QtSerialPort
 INSTALLS              += target_headers
 
-mkspecs_features.files    = $$SERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf
+mkspecs_features.files    = $$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf
 mkspecs_features.path     = $$[QT_INSTALL_DATA]/mkspecs/features
 INSTALLS                  += mkspecs_features
 
diff --git a/src/serialport/qt4support/serialport.prf b/src/serialport/qt4support/serialport.prf
index 489acb54..c8bf5ded 100644
--- a/src/serialport/qt4support/serialport.prf
+++ b/src/serialport/qt4support/serialport.prf
@@ -1,29 +1,26 @@
-!exists($$[QT_INSTALL_HEADERS]/QtAddOnSerialPort) {
-    INCLUDEPATH += $$SERIALPORT_BUILD_ROOT/include $$SERIALPORT_BUILD_ROOT/include/QtAddOnSerialPort
+!exists($$[QT_INSTALL_HEADERS]/QtSerialPort) {
+    INCLUDEPATH += $$QTSERIALPORT_BUILD_ROOT/include $$QTSERIALPORT_BUILD_ROOT/include/QtSerialPort
 
-    SERIALPORT_BUILD_SUBDIR = src/serialport
+    QTSERIALPORT_BUILD_SUBDIR = src/serialport
     win32 {
         CONFIG(debug, debug|release) {
-            SERIALPORT_BUILD_SUBDIR = $$SERIALPORT_BUILD_SUBDIR/debug
+            QTSERIALPORT_BUILD_SUBDIR = $$QTSERIALPORT_BUILD_SUBDIR/debug
         } else {
-            SERIALPORT_BUILD_SUBDIR = $$SERIALPORT_BUILD_SUBDIR/release
+            QTSERIALPORT_BUILD_SUBDIR = $$QTSERIALPORT_BUILD_SUBDIR/release
         }
     }
 
-    LIBS += -L$$SERIALPORT_BUILD_ROOT/$$SERIALPORT_BUILD_SUBDIR
+    LIBS += -L$$QTSERIALPORT_BUILD_ROOT/$$QTSERIALPORT_BUILD_SUBDIR
 }
 
-qtAddLibrary(SerialPort)
+qtAddLibrary(QtSerialPort)
 
 mac {
-    LIBS -= -framework SerialPort$${QT_LIBINFIX}
+    LIBS -= -framework QtSerialPort$${QT_LIBINFIX}
 
    if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
-       LIBS += -lSerialPort$${QT_LIBINFIX}_debug
+       LIBS += -lQtSerialPort$${QT_LIBINFIX}_debug
    } else {
-       LIBS += -lSerialPort$${QT_LIBINFIX}
+       LIBS += -lQtSerialPort$${QT_LIBINFIX}
    }
 }
-
-INCLUDEPATH -= $$[QT_INSTALL_HEADERS]/SerialPort
-INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtAddOnSerialPort
diff --git a/src/serialport/serialport-lib.pri b/src/serialport/serialport-lib.pri
index 3d946c16..46ed0585 100644
--- a/src/serialport/serialport-lib.pri
+++ b/src/serialport/serialport-lib.pri
@@ -38,7 +38,7 @@ symbian {
     TARGET.UID3 = 0xE7E62DFD
     TARGET.CAPABILITY =
     TARGET.EPOCALLOWDLLDATA = 1
-    addFiles.sources = SerialPort.dll
+    addFiles.sources = QtSerialPort.dll
     addFiles.path = !:/sys/bin
     DEPLOYMENT += addFiles
 
diff --git a/src/serialport/serialport.cpp b/src/serialport/serialport.cpp
index b168b087..7c12fea8 100644
--- a/src/serialport/serialport.cpp
+++ b/src/serialport/serialport.cpp
@@ -94,7 +94,7 @@ int SerialPortPrivateData::timeoutValue(int msecs, int elapsed)
 
     \reentrant
     \ingroup serialport-main
-    \inmodule QtAddOnSerialPort
+    \inmodule QtSerialPort
     \since 5.0
 
     This class resembles the functionality and behavior of the QAbstractSocket
diff --git a/src/serialport/serialport.pro b/src/serialport/serialport.pro
index 52d480c4..0046e123 100644
--- a/src/serialport/serialport.pro
+++ b/src/serialport/serialport.pro
@@ -8,11 +8,11 @@ include($$PWD/serialport-lib.pri)
 greaterThan(QT_MAJOR_VERSION, 4) {
     load(qt_build_config)
     QT += core-private
-    TARGET = QtAddOnSerialPort
+    TARGET = QtSerialPort
     load(qt_module)
 } else {
     TEMPLATE = lib
-    TARGET = $$qtLibraryTarget(SerialPort$$QT_LIBINFIX)
+    TARGET = $$qtLibraryTarget(QtSerialPort$$QT_LIBINFIX)
     include($$PWD/qt4support/install-helper.pri)
     CONFIG += module create_prl
     win32|mac:CONFIG += debug_and_release build_all
diff --git a/src/serialport/serialportinfo.cpp b/src/serialport/serialportinfo.cpp
index d47f2045..9c4b9645 100644
--- a/src/serialport/serialportinfo.cpp
+++ b/src/serialport/serialportinfo.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE_SERIALPORT
     existing serial ports.
 
     \ingroup serialport-main
-    \inmodule QtAddOnSerialPort
+    \inmodule QtSerialPort
     \since 5.0
 
     Use the static functions to generate a list of SerialPortInfo
diff --git a/sync.profile b/sync.profile
index 4b375ff3..e193dcbd 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,5 +1,5 @@
 %modules = (
-    "QtAddOnSerialPort" => "$basedir/src/serialport",
+    "QtSerialPort" => "$basedir/src/serialport",
 );
 
 %moduleheaders = (
diff --git a/tests/manual/serialport/tst_serialport.cpp b/tests/manual/serialport/tst_serialport.cpp
index 3ae02664..91c55900 100644
--- a/tests/manual/serialport/tst_serialport.cpp
+++ b/tests/manual/serialport/tst_serialport.cpp
@@ -42,8 +42,8 @@
 #include <QtTest/QtTest>
 #include <QtCore/QDebug>
 
-#include <QtAddOnSerialPort/serialportinfo.h>
-#include <QtAddOnSerialPort/serialport.h>
+#include <QtSerialPort/serialportinfo.h>
+#include <QtSerialPort/serialport.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
diff --git a/tests/manual/serialportinfo/tst_serialportinfo.cpp b/tests/manual/serialportinfo/tst_serialportinfo.cpp
index 205b1b3d..80e01727 100644
--- a/tests/manual/serialportinfo/tst_serialportinfo.cpp
+++ b/tests/manual/serialportinfo/tst_serialportinfo.cpp
@@ -42,8 +42,8 @@
 #include <QtTest/QtTest>
 #include <QtCore/QDebug>
 
-#include <QtAddOnSerialPort/serialportinfo.h>
-#include <QtAddOnSerialPort/serialport.h>
+#include <QtSerialPort/serialportinfo.h>
+#include <QtSerialPort/serialport.h>
 
 QT_USE_NAMESPACE_SERIALPORT