diff options
author | Andre Hartmann <aha_1980@gmx.de> | 2016-04-21 20:58:21 +0200 |
---|---|---|
committer | André Hartmann <aha_1980@gmx.de> | 2016-04-22 06:04:47 +0000 |
commit | 33d19928d7c5beeacdc3d3c57bc5ed95d26934a5 (patch) | |
tree | 1f578aac7e713e60d1af55861880b702c5deec53 | |
parent | f342b8243e292525ba72c9b34cc6f416d2f11e96 (diff) |
Adjust Pointer and Reference to Qt Coding Style
Change-Id: Ifa233b324a82209cb597b5cf555b4e290b890e10
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
-rw-r--r-- | examples/serialbus/modbus/adueditor/mainwindow.cpp | 4 | ||||
-rw-r--r-- | examples/serialbus/modbus/adueditor/mainwindow.h | 2 | ||||
-rw-r--r-- | examples/serialbus/modbus/master/mainwindow.h | 4 | ||||
-rw-r--r-- | examples/serialbus/modbus/master/writeregistermodel.h | 2 | ||||
-rw-r--r-- | examples/serialbus/modbus/slave/mainwindow.cpp | 6 | ||||
-rw-r--r-- | examples/serialbus/modbus/slave/mainwindow.h | 4 | ||||
-rw-r--r-- | src/plugins/canbus/peakcan/peakcan_symbols_p.h | 4 | ||||
-rw-r--r-- | src/serialbus/doc/snippets/snippetmain.cpp | 2 | ||||
-rw-r--r-- | src/serialbus/qmodbuspdu.cpp | 4 | ||||
-rw-r--r-- | src/serialbus/qmodbuspdu.h | 2 | ||||
-rw-r--r-- | src/tools/canbusutil/canbusutil.cpp | 8 | ||||
-rw-r--r-- | src/tools/canbusutil/canbusutil.h | 6 | ||||
-rw-r--r-- | src/tools/canbusutil/readtask.cpp | 6 | ||||
-rw-r--r-- | src/tools/canbusutil/readtask.h | 4 | ||||
-rw-r--r-- | src/tools/canbusutil/sigtermhandler.cpp | 2 |
15 files changed, 30 insertions, 30 deletions
diff --git a/examples/serialbus/modbus/adueditor/mainwindow.cpp b/examples/serialbus/modbus/adueditor/mainwindow.cpp index e53e6c3..51f1840 100644 --- a/examples/serialbus/modbus/adueditor/mainwindow.cpp +++ b/examples/serialbus/modbus/adueditor/mainwindow.cpp @@ -55,7 +55,7 @@ QT_USE_NAMESPACE -MainWindow* s_instance = nullptr; +MainWindow *s_instance = nullptr; static void HandlerFunction(QtMsgType, const QMessageLogContext &, const QString &msg) { @@ -90,7 +90,7 @@ MainWindow::~MainWindow() s_instance = nullptr; } -MainWindow* MainWindow::instance() +MainWindow *MainWindow::instance() { return s_instance; } diff --git a/examples/serialbus/modbus/adueditor/mainwindow.h b/examples/serialbus/modbus/adueditor/mainwindow.h index 3ea1b8a..4e229b5 100644 --- a/examples/serialbus/modbus/adueditor/mainwindow.h +++ b/examples/serialbus/modbus/adueditor/mainwindow.h @@ -72,7 +72,7 @@ public: explicit MainWindow(QWidget *parent = nullptr); ~MainWindow(); - static MainWindow* instance(); + static MainWindow *instance(); void appendToLog(const QString &msg) { logTextEdit->appendPlainText(msg); } diff --git a/examples/serialbus/modbus/master/mainwindow.h b/examples/serialbus/modbus/master/mainwindow.h index 251c16f..f160a76 100644 --- a/examples/serialbus/modbus/master/mainwindow.h +++ b/examples/serialbus/modbus/master/mainwindow.h @@ -87,8 +87,8 @@ private slots: private: Ui::MainWindow *ui; - QModbusReply* lastRequest; - QModbusClient* modbusDevice; + QModbusReply *lastRequest; + QModbusClient *modbusDevice; SettingsDialog *m_settingsDialog; WriteRegisterModel *writeModel; }; diff --git a/examples/serialbus/modbus/master/writeregistermodel.h b/examples/serialbus/modbus/master/writeregistermodel.h index 79ebf29..345e920 100644 --- a/examples/serialbus/modbus/master/writeregistermodel.h +++ b/examples/serialbus/modbus/master/writeregistermodel.h @@ -50,7 +50,7 @@ class WriteRegisterModel : public QAbstractTableModel Q_OBJECT public: - WriteRegisterModel(QObject* parent = nullptr); + WriteRegisterModel(QObject *parent = nullptr); int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; diff --git a/examples/serialbus/modbus/slave/mainwindow.cpp b/examples/serialbus/modbus/slave/mainwindow.cpp index 537a6ad..50d5faf 100644 --- a/examples/serialbus/modbus/slave/mainwindow.cpp +++ b/examples/serialbus/modbus/slave/mainwindow.cpp @@ -300,19 +300,19 @@ void MainWindow::setupWidgetContainers() discreteButtons.setExclusive(false); QRegularExpression regexp(QStringLiteral("coils_(?<ID>\\d+)")); - const QList<QCheckBox*> coils = findChildren<QCheckBox*>(regexp); + const QList<QCheckBox *> coils = findChildren<QCheckBox *>(regexp); foreach (QCheckBox *cbx, coils) coilButtons.addButton(cbx, regexp.match(cbx->objectName()).captured("ID").toInt()); connect(&coilButtons, SIGNAL(buttonClicked(int)), this, SLOT(coilChanged(int))); regexp.setPattern(QStringLiteral("disc_(?<ID>\\d+)")); - const QList<QCheckBox*> discs = findChildren<QCheckBox*>(regexp); + const QList<QCheckBox *> discs = findChildren<QCheckBox *>(regexp); foreach (QCheckBox *cbx, discs) discreteButtons.addButton(cbx, regexp.match(cbx->objectName()).captured("ID").toInt()); connect(&discreteButtons, SIGNAL(buttonClicked(int)), this, SLOT(discreteInputChanged(int))); regexp.setPattern(QLatin1String("(in|hold)Reg_(?<ID>\\d+)")); - const QList<QLineEdit*> qle = findChildren<QLineEdit*>(regexp); + const QList<QLineEdit *> qle = findChildren<QLineEdit *>(regexp); foreach (QLineEdit *lineEdit, qle) { registers.insert(lineEdit->objectName(), lineEdit); lineEdit->setProperty("ID", regexp.match(lineEdit->objectName()).captured("ID").toInt()); diff --git a/examples/serialbus/modbus/slave/mainwindow.h b/examples/serialbus/modbus/slave/mainwindow.h index 5c0382d..f6a1527 100644 --- a/examples/serialbus/modbus/slave/mainwindow.h +++ b/examples/serialbus/modbus/slave/mainwindow.h @@ -87,11 +87,11 @@ private: void setupWidgetContainers(); Ui::MainWindow *ui; - QModbusServer* modbusDevice; + QModbusServer *modbusDevice; QButtonGroup coilButtons; QButtonGroup discreteButtons; - QHash<QString, QLineEdit*> registers; + QHash<QString, QLineEdit *> registers; SettingsDialog *m_settingsDialog; }; diff --git a/src/plugins/canbus/peakcan/peakcan_symbols_p.h b/src/plugins/canbus/peakcan/peakcan_symbols_p.h index 8cb5d12..cb90599 100644 --- a/src/plugins/canbus/peakcan/peakcan_symbols_p.h +++ b/src/plugins/canbus/peakcan/peakcan_symbols_p.h @@ -266,8 +266,8 @@ GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_Initialize, TPCANHandle, TPCANBaudrate GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_Uninitialize, TPCANHandle) GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_Reset, TPCANHandle) GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_GetStatus, TPCANHandle) -GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_Read, TPCANHandle, TPCANMsg*, TPCANTimestamp*) -GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_Write, TPCANHandle, TPCANMsg*) +GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_Read, TPCANHandle, TPCANMsg *, TPCANTimestamp *) +GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_Write, TPCANHandle, TPCANMsg *) GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_FilterMessages, TPCANHandle, quint32, quint32, TPCANMode) GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_GetValue, TPCANHandle, TPCANParameter, void *, quint32) GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_SetValue, TPCANHandle, TPCANParameter, void *, quint32) diff --git a/src/serialbus/doc/snippets/snippetmain.cpp b/src/serialbus/doc/snippets/snippetmain.cpp index 1852d47..a833454 100644 --- a/src/serialbus/doc/snippets/snippetmain.cpp +++ b/src/serialbus/doc/snippets/snippetmain.cpp @@ -43,7 +43,7 @@ int main(int /*argc*/, char ** /*argv*/) { - QCanBusDevice * device = nullptr; + QCanBusDevice *device = nullptr; //! [Filter Examples] QCanBusDevice::Filter filter; diff --git a/src/serialbus/qmodbuspdu.cpp b/src/serialbus/qmodbuspdu.cpp index 2f20747..4f7f8a9 100644 --- a/src/serialbus/qmodbuspdu.cpp +++ b/src/serialbus/qmodbuspdu.cpp @@ -99,7 +99,7 @@ static int minimumDataSize(const QModbusPdu &pdu, Type type) static QDataStream &pduFromStream(QDataStream &stream, QModbusPdu &pdu, Type type) { QModbusPdu::FunctionCode code = QModbusPdu::Invalid; - if (stream.readRawData((char*) (&code), sizeof(quint8)) != sizeof(quint8)) + if (stream.readRawData((char *) (&code), sizeof(quint8)) != sizeof(quint8)) return stream; pdu.setFunctionCode(code); @@ -291,7 +291,7 @@ static QDataStream &pduFromStream(QDataStream &stream, QModbusPdu &pdu, Type typ */ /*! - \fn QModbusPdu& QModbusPdu::operator=(const QModbusPdu& other) + \fn QModbusPdu &QModbusPdu::operator=(const QModbusPdu &other) Makes a copy of the \a other and assigns it to this QModbusPdu object. */ diff --git a/src/serialbus/qmodbuspdu.h b/src/serialbus/qmodbuspdu.h index 12fd33f..15abc20 100644 --- a/src/serialbus/qmodbuspdu.h +++ b/src/serialbus/qmodbuspdu.h @@ -148,7 +148,7 @@ private: } template <typename T> void decode(QDataStream *stream, T &t) const { static_assert(std::is_pod<T>::value, "Only POD types supported."); - static_assert(IsType<T, quint8*, quint16*>::value, "Only quint8* and quint16* supported."); + static_assert(IsType<T, quint8 *, quint16 *>::value, "Only quint8* and quint16* supported."); (*stream) >> *t; } template <typename T> void encode(QDataStream *stream, const QVector<T> &vector) { diff --git a/src/tools/canbusutil/canbusutil.cpp b/src/tools/canbusutil/canbusutil.cpp index f2d3bcd..299a252 100644 --- a/src/tools/canbusutil/canbusutil.cpp +++ b/src/tools/canbusutil/canbusutil.cpp @@ -39,7 +39,7 @@ static const qint8 MAXNORMALPAYLOADSIZE = 8; static const qint8 MAXEXTENDEDPAYLOADSIZE = 64; -CanBusUtil::CanBusUtil(QTextStream& output, QCoreApplication& app, QObject *parent) +CanBusUtil::CanBusUtil(QTextStream &output, QCoreApplication &app, QObject *parent) : QObject(parent), canBus(QCanBus::instance()), output(output), @@ -131,7 +131,7 @@ bool CanBusUtil::parseArgs(int argc, char *argv[]) return true; } -bool CanBusUtil::parseDataField(qint32& id, QString& payload) +bool CanBusUtil::parseDataField(qint32 &id, QString &payload) { int hashMarkPos = data.indexOf('#'); if (hashMarkPos < 0) { @@ -150,8 +150,8 @@ bool CanBusUtil::parseDataField(qint32& id, QString& payload) return true; } -bool CanBusUtil::parsePayloadField(QString payload, bool& rtrFrame, - bool& fdFrame, QByteArray& bytes) +bool CanBusUtil::parsePayloadField(QString payload, bool &rtrFrame, + bool &fdFrame, QByteArray &bytes) { fdFrame = false; rtrFrame = false; diff --git a/src/tools/canbusutil/canbusutil.h b/src/tools/canbusutil/canbusutil.h index 6d755c7..42d4bcf 100644 --- a/src/tools/canbusutil/canbusutil.h +++ b/src/tools/canbusutil/canbusutil.h @@ -47,7 +47,7 @@ class CanBusUtil : public QObject { Q_OBJECT public: - explicit CanBusUtil(QTextStream& output, QCoreApplication& app, QObject *parent = nullptr); + explicit CanBusUtil(QTextStream &output, QCoreApplication &app, QObject *parent = nullptr); bool start(int argc, char *argv[]); @@ -64,8 +64,8 @@ private: private: QPointer<QCanBus> canBus; - QTextStream& output; - QCoreApplication& app; + QTextStream &output; + QCoreApplication &app; bool listening; QString pluginName; QString deviceName; diff --git a/src/tools/canbusutil/readtask.cpp b/src/tools/canbusutil/readtask.cpp index 768e462..284c302 100644 --- a/src/tools/canbusutil/readtask.cpp +++ b/src/tools/canbusutil/readtask.cpp @@ -38,12 +38,12 @@ using namespace std; -ReadTask::ReadTask(QTextStream& output, QObject *parent) +ReadTask::ReadTask(QTextStream &output, QObject *parent) : QObject(parent), output(output) { } void ReadTask::checkMessages() { - QCanBusDevice* canDevice = qobject_cast<QCanBusDevice*>(QObject::sender()); + QCanBusDevice *canDevice = qobject_cast<QCanBusDevice *>(QObject::sender()); if (canDevice == nullptr) { qWarning() << "ReadTask::checkMessages: Unknown sender"; return; @@ -81,7 +81,7 @@ void ReadTask::checkMessages() { } void ReadTask::receiveError(QCanBusDevice::CanBusError /*error*/) { - QCanBusDevice* canDevice = qobject_cast<QCanBusDevice*>(QObject::sender()); + QCanBusDevice *canDevice = qobject_cast<QCanBusDevice *>(QObject::sender()); if (canDevice == nullptr) { qWarning() << "ReadTask::receiveError: Unknown sender"; return; diff --git a/src/tools/canbusutil/readtask.h b/src/tools/canbusutil/readtask.h index b0a9366..a59f218 100644 --- a/src/tools/canbusutil/readtask.h +++ b/src/tools/canbusutil/readtask.h @@ -45,7 +45,7 @@ class ReadTask : public QObject { Q_OBJECT public: - explicit ReadTask(QTextStream& output, QObject *parent = nullptr); + explicit ReadTask(QTextStream &output, QObject *parent = nullptr); signals: void sigTermSignal(); @@ -55,7 +55,7 @@ public slots: void receiveError(QCanBusDevice::CanBusError /*error*/); private: - QTextStream& output; + QTextStream &output; }; #endif // READTASK_H diff --git a/src/tools/canbusutil/sigtermhandler.cpp b/src/tools/canbusutil/sigtermhandler.cpp index fba7269..a6523a8 100644 --- a/src/tools/canbusutil/sigtermhandler.cpp +++ b/src/tools/canbusutil/sigtermhandler.cpp @@ -40,7 +40,7 @@ QPointer<SigTermHandler> SigTermHandler::instance() { - static SigTermHandler* inst = new SigTermHandler(); + static SigTermHandler *inst = new SigTermHandler(); return inst; } |