b612
/
Proxmark3GUI
mirror of https://github.com/wh201906/Proxmark3GUI
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace QString with const QString&

Browse Source
pull/14/head
wh201906 4 years ago
parent 862f0775f8
commit f2d00ee088
12 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File

3
common/pm3process.cpp
Unescape Escape View File

@ -14,7 +14,7 @@ PM3Process::PM3Process(QThread* thread, QObject* parent): QProcess(parent)
connect(this, &PM3Process::readyRead, this, &PM3Process::onReadyRead); connect(this, &PM3Process::readyRead, this, &PM3Process::onReadyRead);
} }
void PM3Process::connectPM3(const QString path, const QString port) void PM3Process::connectPM3(const QString& path, const QString& port)
{ {
QString result; QString result;
Util::ClientType clientType = Util::CLIENTTYPE_OFFICIAL; Util::ClientType clientType = Util::CLIENTTYPE_OFFICIAL;
@ -93,7 +93,6 @@ void PM3Process::testThread()
qDebug() << "PM3:" << QThread::currentThread(); qDebug() << "PM3:" << QThread::currentThread();
} }
qint64 PM3Process::write(QString data) qint64 PM3Process::write(QString data)
{ {
return QProcess::write(data.toLatin1()); return QProcess::write(data.toLatin1());

8
common/pm3process.h
Unescape Escape View File

@ -21,8 +21,8 @@ public:
void testThread(); void testThread();
public slots: public slots:
void connectPM3(const QString path, const QString port); void connectPM3(const QString& path, const QString& port);
void setSerialListener(const QString &name, bool state); void setSerialListener(const QString& name, bool state);
qint64 write(QString data); qint64 write(QString data);
private slots: private slots:
void onTimeout(); void onTimeout();
@ -34,8 +34,8 @@ private:
QTimer* serialListener; QTimer* serialListener;
QSerialPortInfo* portInfo; QSerialPortInfo* portInfo;
signals: signals:
void PM3StatedChanged(bool st, QString info = ""); void PM3StatedChanged(bool st, const QString& info = "");
void newOutput(QString output); void newOutput(const QString& output);
void changeClientType(Util::ClientType); void changeClientType(Util::ClientType);
}; };

6
common/util.cpp
Unescape Escape View File

@ -9,7 +9,7 @@ Util::Util(QObject *parent) : QObject(parent)
qRegisterMetaType<Util::ClientType>("Util::ClientType"); qRegisterMetaType<Util::ClientType>("Util::ClientType");
} }
void Util::processOutput(QString output) void Util::processOutput(const QString& output)
{ {
// qDebug() << "Util::processOutput:" << output; // qDebug() << "Util::processOutput:" << output;
if(isRequiringOutput) if(isRequiringOutput)
@ -20,14 +20,14 @@ void Util::processOutput(QString output)
emit refreshOutput(output); emit refreshOutput(output);
} }
void Util::execCMD(QString cmd) void Util::execCMD(const QString& cmd)
{ {
qDebug() << cmd; qDebug() << cmd;
if(isRunning) if(isRunning)
emit write(cmd + "\r\n"); emit write(cmd + "\r\n");
} }
QString Util::execCMDWithOutput(QString cmd, ReturnTrigger trigger) QString Util::execCMDWithOutput(const QString& cmd, ReturnTrigger trigger)
{ {
bool isResultFound = false; bool isResultFound = false;
QRegularExpression re; QRegularExpression re;

12
common/util.h
Unescape Escape View File

@ -30,12 +30,12 @@ public:
waitTime = time; waitTime = time;
expectedOutputs = QStringList(); expectedOutputs = QStringList();
} }
ReturnTrigger(QStringList outputs) ReturnTrigger(const QStringList& outputs)
{ {
waitTime = 10000; waitTime = 10000;
expectedOutputs = outputs; expectedOutputs = outputs;
} }
ReturnTrigger(unsigned long time, QStringList outputs) ReturnTrigger(unsigned long time, const QStringList& outputs)
{ {
waitTime = time; waitTime = time;
expectedOutputs = outputs; expectedOutputs = outputs;
@ -46,12 +46,12 @@ public:
explicit Util(QObject *parent = nullptr); explicit Util(QObject *parent = nullptr);
void execCMD(QString cmd); void execCMD(const QString& cmd);
QString execCMDWithOutput(QString cmd, ReturnTrigger trigger = 10000); QString execCMDWithOutput(const QString& cmd, ReturnTrigger trigger = 10000);
void delay(unsigned int msec); void delay(unsigned int msec);
ClientType getClientType(); ClientType getClientType();
public slots: public slots:
void processOutput(QString output); void processOutput(const QString& output);
void setClientType(Util::ClientType clientType); void setClientType(Util::ClientType clientType);
void setRunningState(bool st); void setRunningState(bool st);
@ -63,7 +63,7 @@ private:
ClientType clientType; ClientType clientType;
signals: signals:
void refreshOutput(const QString& output); void refreshOutput(const QString& output);
void write(QString data); void write(QString data); // connected to PM3Process::write(QString data);
}; };
#endif // UTIL_H #endif // UTIL_H

16
module/mifare.cpp
Unescape Escape View File

@ -872,7 +872,7 @@ void Mifare::data_clearKey(bool clearAll)
} }
} }
bool Mifare::data_isKeyValid(const QString &key) bool Mifare::data_isKeyValid(const QString& key)
{ {
if(key.length() != 12) if(key.length() != 12)
return false; return false;
@ -938,7 +938,7 @@ void Mifare::setCardType(int type)
} }
} }
bool Mifare::data_loadDataFile(const QString &filename) bool Mifare::data_loadDataFile(const QString& filename)
{ {
QFile file(filename, this); QFile file(filename, this);
if(file.open(QIODevice::ReadOnly)) if(file.open(QIODevice::ReadOnly))
@ -985,7 +985,7 @@ bool Mifare::data_loadDataFile(const QString &filename)
} }
} }
bool Mifare::data_loadKeyFile(const QString &filename) bool Mifare::data_loadKeyFile(const QString& filename)
{ {
QFile file(filename, this); QFile file(filename, this);
if(file.open(QIODevice::ReadOnly)) if(file.open(QIODevice::ReadOnly))
@ -1022,7 +1022,7 @@ bool Mifare::data_loadKeyFile(const QString &filename)
} }
} }
QString Mifare::bin2text(const QByteArray &buff, int i, int length) QString Mifare::bin2text(const QByteArray& buff, int i, int length)
{ {
QString ret = ""; QString ret = "";
char LByte, RByte; char LByte, RByte;
@ -1040,7 +1040,7 @@ QString Mifare::bin2text(const QByteArray &buff, int i, int length)
return ret; return ret;
} }
bool Mifare::data_saveDataFile(const QString &filename, bool isBin) bool Mifare::data_saveDataFile(const QString& filename, bool isBin)
{ {
QFile file(filename, this); QFile file(filename, this);
if(file.open(QIODevice::WriteOnly)) if(file.open(QIODevice::WriteOnly))
@ -1084,7 +1084,7 @@ bool Mifare::data_saveDataFile(const QString &filename, bool isBin)
} }
} }
bool Mifare::data_saveKeyFile(const QString &filename, bool isBin) bool Mifare::data_saveKeyFile(const QString& filename, bool isBin)
{ {
QFile file(filename, this); QFile file(filename, this);
if(file.open(QIODevice::WriteOnly)) if(file.open(QIODevice::WriteOnly))
@ -1179,12 +1179,12 @@ void Mifare::data_data2Key()
} }
} }
void Mifare::data_setData(int block, const QString &data) void Mifare::data_setData(int block, const QString& data)
{ {
dataList->replace(block, data); dataList->replace(block, data);
} }
void Mifare::data_setKey(int sector, KeyType keyType, const QString &key) void Mifare::data_setKey(int sector, KeyType keyType, const QString& key)
{ {
if(keyType == KEY_A) if(keyType == KEY_A)
keyAList->replace(sector, key); keyAList->replace(sector, key);

10
module/mifare.h
Unescape Escape View File

@ -106,9 +106,9 @@ public:
void saveSniff(const QString& file); void saveSniff(const QString& file);
void data_fillKeys(); void data_fillKeys();
static QList<quint8> data_getACBits(const QString &text); static QList<quint8> data_getACBits(const QString& text);
static int data_b2s(int block); static int data_b2s(int block);
static bool data_isACBitsValid(const QString &text, QList<quint8> *returnHalfBytes = nullptr); static bool data_isACBitsValid(const QString& text, QList<quint8> *returnHalfBytes = nullptr);
public slots: public slots:
signals: signals:
@ -125,9 +125,9 @@ private:
QRegularExpression* keyPattern; QRegularExpression* keyPattern;
QString bin2text(const QByteArray& buff, int start, int length); QString bin2text(const QByteArray& buff, int start, int length);
QString _readblk(int blockId, KeyType keyType, const QString &key, TargetType targetType = TARGET_MIFARE, int waitTime = 300); QString _readblk(int blockId, KeyType keyType, const QString& key, TargetType targetType = TARGET_MIFARE, int waitTime = 300);
QStringList _readsec(int sectorId, KeyType keyType, const QString &key, TargetType targetType = TARGET_MIFARE, int waitTime = 300); QStringList _readsec(int sectorId, KeyType keyType, const QString& key, TargetType targetType = TARGET_MIFARE, int waitTime = 300);
bool _writeblk(int blockId, KeyType keyType, const QString &key, const QString &data, TargetType targetType = TARGET_MIFARE, int waitTime = 300); bool _writeblk(int blockId, KeyType keyType, const QString& key, const QString& data, TargetType targetType = TARGET_MIFARE, int waitTime = 300);
}; };
#endif // MIFARE_H #endif // MIFARE_H

8
ui/mainwindow.cpp
Unescape Escape View File

@ -86,7 +86,7 @@ void MainWindow::on_PM3_connectButton_clicked()
} }
} }
void MainWindow::onPM3StateChanged(bool st, QString info) void MainWindow::onPM3StateChanged(bool st, const QString& info)
{ {
pm3state = st; pm3state = st;
setState(st); setState(st);
@ -898,7 +898,7 @@ void MainWindow::signalInit()
connect(stopButton, &QPushButton::clicked, this, &MainWindow::on_stopButton_clicked); connect(stopButton, &QPushButton::clicked, this, &MainWindow::on_stopButton_clicked);
} }
void MainWindow::setStatusBar(QLabel * target, const QString & text) void MainWindow::setStatusBar(QLabel * target, const QString& text)
{ {
if(target == PM3VersionBar) if(target == PM3VersionBar)
target->setText(tr("HW Version:") + text); target->setText(tr("HW Version:") + text);
@ -908,7 +908,7 @@ void MainWindow::setStatusBar(QLabel * target, const QString & text)
target->setText(tr("State:") + text); target->setText(tr("State:") + text);
} }
void MainWindow::setTableItem(QTableWidget * widget, int row, int column, const QString & text) void MainWindow::setTableItem(QTableWidget * widget, int row, int column, const QString& text)
{ {
if(widget->item(row, column) == nullptr) if(widget->item(row, column) == nullptr)
widget->setItem(row, column, new QTableWidgetItem()); widget->setItem(row, column, new QTableWidgetItem());
@ -993,7 +993,7 @@ void MainWindow::on_GroupBox_clicked(bool checked)
settings->endGroup(); settings->endGroup();
} }
void MainWindow::saveClientPath(const QString & path) void MainWindow::saveClientPath(const QString& path)
{ {
settings->beginGroup("Client_Path"); settings->beginGroup("Client_Path");
settings->setValue("path", path); settings->setValue("path", path);

16
ui/mainwindow.h
Unescape Escape View File

@ -44,10 +44,10 @@ public:
void initUI(); void initUI();
bool eventFilter(QObject *watched, QEvent *event); bool eventFilter(QObject *watched, QEvent *event);
public slots: public slots:
void refreshOutput(const QString &output); void refreshOutput(const QString& output);
void refreshCMD(const QString &cmd); void refreshCMD(const QString& cmd);
void setStatusBar(QLabel* target, const QString & text); void setStatusBar(QLabel* target, const QString& text);
void onPM3StateChanged(bool st, QString info); void onPM3StateChanged(bool st, const QString& info);
void MF_onTypeChanged(int id, bool st); void MF_onTypeChanged(int id, bool st);
private slots: private slots:
@ -175,12 +175,12 @@ private:
void signalInit(); void signalInit();
void MF_widgetReset(); void MF_widgetReset();
void setTableItem(QTableWidget *widget, int row, int column, const QString &text); void setTableItem(QTableWidget *widget, int row, int column, const QString& text);
void setState(bool st); void setState(bool st);
void saveClientPath(const QString &path); void saveClientPath(const QString& path);
signals: signals:
void connectPM3(const QString path, const QString port); void connectPM3(const QString& path, const QString& port);
void killPM3(); void killPM3();
void setSerialListener(const QString &name, bool state); void setSerialListener(const QString& name, bool state);
}; };
#endif // MAINWINDOW_H #endif // MAINWINDOW_H

5
ui/mf_attack_hardnesteddialog.h
Unescape Escape View File

@ -3,7 +3,8 @@
#include <QDialog> #include <QDialog>
namespace Ui { namespace Ui
{
class MF_Attack_hardnestedDialog; class MF_Attack_hardnestedDialog;
} }
@ -19,7 +20,7 @@ public:
private: private:
Ui::MF_Attack_hardnestedDialog *ui; Ui::MF_Attack_hardnestedDialog *ui;
signals: signals:
void sendCMD(QString cmd); void sendCMD(const QString& cmd);
private slots: private slots:
void on_buttonBox_accepted(); void on_buttonBox_accepted();
}; };

2
ui/mf_sim_simdialog.h
Unescape Escape View File

@ -26,7 +26,7 @@ private:
Ui::MF_Sim_simDialog *ui; Ui::MF_Sim_simDialog *ui;
int cardType; int cardType;
signals: signals:
void sendCMD(QString cmd); void sendCMD(const QString& cmd);
private slots: private slots:
void on_buttonBox_accepted(); void on_buttonBox_accepted();
}; };

4
ui/mf_trailerdecoderdialog.h
Unescape Escape View File

@ -23,11 +23,11 @@ public:
private slots: private slots:
void on_accessBitsEdit_textChanged(const QString &arg1); void on_accessBitsEdit_textChanged(const QString& arg1);
void on_blockSizeChanged(int id, bool st); void on_blockSizeChanged(int id, bool st);
void on_boxChanged(const QString &arg1); void on_boxChanged(const QString& arg1);
private: private:
Ui::MF_trailerDecoderDialog *ui; Ui::MF_trailerDecoderDialog *ui;
QRegularExpressionValidator* validator; QRegularExpressionValidator* validator;

5
ui/mf_uid_parameterdialog.h
Unescape Escape View File

@ -3,7 +3,8 @@
#include <QDialog> #include <QDialog>
namespace Ui { namespace Ui
{
class MF_UID_parameterDialog; class MF_UID_parameterDialog;
} }
@ -18,7 +19,7 @@ public:
private: private:
Ui::MF_UID_parameterDialog *ui; Ui::MF_UID_parameterDialog *ui;
signals: signals:
void sendCMD(QString cmd); void sendCMD(const QString& cmd);
private slots: private slots:
void on_buttonBox_accepted(); void on_buttonBox_accepted();
}; };

Write Preview
Loading…
Cancel
Save