Remove the QtSerialPort namespace define and hence namespace usage

* This is for following the convention in the Qt Project with the rest.

* This fixes examples and tests to build now as all of them are broken due to
the regression.

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

14 files changed, 16 insertions, 14 deletions

diff --git a/examples/blockingmaster/dialog.cpp b/examples/blockingmaster/dialog.cpp
index 1686ad9..7cd04e0 100644
--- a/examples/blockingmaster/dialog.cpp
+++ b/examples/blockingmaster/dialog.cpp
@@ -50,7 +50,7 @@
 
 #include <QtSerialPort/QSerialPortInfo>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 Dialog::Dialog(QWidget *parent)
     : QDialog(parent)
diff --git a/examples/blockingmaster/masterthread.cpp b/examples/blockingmaster/masterthread.cpp
index 8d72b42..1ca38f4 100644
--- a/examples/blockingmaster/masterthread.cpp
+++ b/examples/blockingmaster/masterthread.cpp
@@ -45,7 +45,7 @@
 
 #include <QTime>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 MasterThread::MasterThread(QObject *parent)
     : QThread(parent), waitTimeout(0), quit(false)
diff --git a/examples/blockingslave/dialog.cpp b/examples/blockingslave/dialog.cpp
index 947de74..9bdbbf6 100644
--- a/examples/blockingslave/dialog.cpp
+++ b/examples/blockingslave/dialog.cpp
@@ -50,7 +50,7 @@
 
 #include <QtSerialPort/QSerialPortInfo>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 Dialog::Dialog(QWidget *parent)
     : QDialog(parent)
diff --git a/examples/blockingslave/slavethread.cpp b/examples/blockingslave/slavethread.cpp
index 678c19f..9b49edb 100644
--- a/examples/blockingslave/slavethread.cpp
+++ b/examples/blockingslave/slavethread.cpp
@@ -45,7 +45,7 @@
 
 #include <QTime>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 SlaveThread::SlaveThread(QObject *parent)
     : QThread(parent), waitTimeout(0), quit(false)
diff --git a/examples/cenumerator/main.cpp b/examples/cenumerator/main.cpp
index a67fac6..f203496 100644
--- a/examples/cenumerator/main.cpp
+++ b/examples/cenumerator/main.cpp
@@ -43,7 +43,7 @@
 #include <QCoreApplication>
 #include <QtSerialPort/QSerialPortInfo>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/enumerator/main.cpp b/examples/enumerator/main.cpp
index 15e4351..0bd3fc0 100644
--- a/examples/enumerator/main.cpp
+++ b/examples/enumerator/main.cpp
@@ -46,7 +46,7 @@
 #include <QLabel>
 #include <QtSerialPort/QSerialPortInfo>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/master/dialog.cpp b/examples/master/dialog.cpp
index 4319a5b..0a27575 100644
--- a/examples/master/dialog.cpp
+++ b/examples/master/dialog.cpp
@@ -50,7 +50,7 @@
 
 #include <QtSerialPort/QSerialPortInfo>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 Dialog::Dialog(QWidget *parent)
     : QDialog(parent)
diff --git a/examples/master/dialog.h b/examples/master/dialog.h
index 6f6d64c..f8944a8 100644
--- a/examples/master/dialog.h
+++ b/examples/master/dialog.h
@@ -47,7 +47,7 @@
 
 #include <QtSerialPort/QSerialPort>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 class QLabel;
 class QLineEdit;
diff --git a/examples/slave/dialog.cpp b/examples/slave/dialog.cpp
index fcfb36c..ddae52a 100644
--- a/examples/slave/dialog.cpp
+++ b/examples/slave/dialog.cpp
@@ -50,7 +50,7 @@
 
 #include <QtSerialPort/QSerialPortInfo>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 Dialog::Dialog(QWidget *parent)
     : QDialog(parent)
diff --git a/examples/slave/dialog.h b/examples/slave/dialog.h
index bd3a431..fcd3476 100644
--- a/examples/slave/dialog.h
+++ b/examples/slave/dialog.h
@@ -47,7 +47,7 @@
 
 #include <QtSerialPort/QSerialPort>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 class QLabel;
 class QLineEdit;
diff --git a/examples/slave/slavethread.cpp b/examples/slave/slavethread.cpp
index fc99c4a..2a32454 100644
--- a/examples/slave/slavethread.cpp
+++ b/examples/slave/slavethread.cpp
@@ -45,7 +45,7 @@
 
 #include <QTime>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 SlaveThread::SlaveThread(QObject *parent)
     : QThread(parent), waitTimeout(0), quit(false)
diff --git a/examples/terminal/mainwindow.h b/examples/terminal/mainwindow.h
index 24e9826..ed85fe2 100644
--- a/examples/terminal/mainwindow.h
+++ b/examples/terminal/mainwindow.h
@@ -56,7 +56,7 @@ class MainWindow;
 class Console;
 class SettingsDialog;
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 class MainWindow : public QMainWindow
 {
diff --git a/examples/terminal/settingsdialog.cpp b/examples/terminal/settingsdialog.cpp
index a125db4..f077933 100644
--- a/examples/terminal/settingsdialog.cpp
+++ b/examples/terminal/settingsdialog.cpp
@@ -47,6 +47,8 @@
 #include <QIntValidator>
 #include <QLineEdit>
 
+QT_USE_NAMESPACE
+
 SettingsDialog::SettingsDialog(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::SettingsDialog)
diff --git a/examples/terminal/settingsdialog.h b/examples/terminal/settingsdialog.h
index e156c5b..b30518a 100644
--- a/examples/terminal/settingsdialog.h
+++ b/examples/terminal/settingsdialog.h
@@ -46,14 +46,14 @@
 #include <QDialog>
 #include <QtSerialPort/QSerialPort>
 
+QT_USE_NAMESPACE
+
 namespace Ui {
 class SettingsDialog;
 }
 
 class QIntValidator;
 
-QT_USE_NAMESPACE_SERIALPORT
-
 class SettingsDialog : public QDialog
 {
     Q_OBJECT