diff options
| author | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2015-09-08 14:35:42 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-09-11 10:16:23 +0000 |
| commit | 036c33da713fda3c17585a48de6d8d1ae67770ef (patch) | |
| tree | 300a75957f9c0dd6641a1ce568f2f6127a915347 /examples/serialbus/can | |
| parent | d1d2345730efe0079713ab50727ef15613cb8492 (diff) | |
Some fixes for namespace compiled Qt.
Change-Id: Ib3fd1d28f68cc6d7afd4138882e03a709cfc7a0a
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'examples/serialbus/can')
| -rw-r--r-- | examples/serialbus/can/main.cpp | 2 | ||||
| -rw-r--r-- | examples/serialbus/can/mainwindow.h | 9 | ||||
| -rw-r--r-- | examples/serialbus/can/settingsdialog.cpp | 2 | ||||
| -rw-r--r-- | examples/serialbus/can/settingsdialog.h | 2 |
4 files changed, 4 insertions, 11 deletions
diff --git a/examples/serialbus/can/main.cpp b/examples/serialbus/can/main.cpp index 4e1d574..f23b403 100644 --- a/examples/serialbus/can/main.cpp +++ b/examples/serialbus/can/main.cpp @@ -41,8 +41,6 @@ #include "mainwindow.h" #include <QApplication> -QT_USE_NAMESPACE - int main(int argc, char *argv[]) { QApplication a(argc, argv); diff --git a/examples/serialbus/can/mainwindow.h b/examples/serialbus/can/mainwindow.h index 99c9491..52f9788 100644 --- a/examples/serialbus/can/mainwindow.h +++ b/examples/serialbus/can/mainwindow.h @@ -45,19 +45,18 @@ #include <QMainWindow> +class SettingsDialog; + QT_BEGIN_NAMESPACE -class QLabel; class QCanBusFrame; - -class SettingsDialog; +class QLabel; namespace Ui { class MainWindow; } -QT_END_NAMESPACE -QT_USE_NAMESPACE +QT_END_NAMESPACE class MainWindow : public QMainWindow { diff --git a/examples/serialbus/can/settingsdialog.cpp b/examples/serialbus/can/settingsdialog.cpp index 34019e3..7f437fa 100644 --- a/examples/serialbus/can/settingsdialog.cpp +++ b/examples/serialbus/can/settingsdialog.cpp @@ -44,8 +44,6 @@ #include <QCanBus> #include <QDebug> -QT_USE_NAMESPACE - SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent), m_ui(new Ui::SettingsDialog), diff --git a/examples/serialbus/can/settingsdialog.h b/examples/serialbus/can/settingsdialog.h index f773596..7e187e6 100644 --- a/examples/serialbus/can/settingsdialog.h +++ b/examples/serialbus/can/settingsdialog.h @@ -55,8 +55,6 @@ class QIntValidator; QT_END_NAMESPACE -QT_USE_NAMESPACE - class SettingsDialog : public QDialog { Q_OBJECT |