b612/Proxmark3GUI
1
0
Fork 0
mirror of https://github.com/wh201906/Proxmark3GUI.git synced 2025-02-16 22:21:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace QString with const QString&

Browse Source
This commit is contained in:
wh201906 2020-08-13 09:30:47 +08:00
parent 862f0775f8
commit f2d00ee088
12 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/pm3process.cpp
View File

@ -14,7 +14,7 @@ PM3Process::PM3Process(QThread* thread, QObject* parent): QProcess(parent)
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;
Util::ClientType clientType = Util::CLIENTTYPE_OFFICIAL;
@ -93,7 +93,6 @@ void PM3Process::testThread()
qDebug() << "PM3:" << QThread::currentThread();
}
qint64 PM3Process::write(QString data)
{
return QProcess::write(data.toLatin1());

6
common/pm3process.h
View File

@ -21,7 +21,7 @@ public:
void testThread();
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);
qint64 write(QString data);
private slots:
@ -34,8 +34,8 @@ private:
QTimer* serialListener;
QSerialPortInfo* portInfo;
signals:
void PM3StatedChanged(bool st, QString info = "");
void newOutput(QString output);
void PM3StatedChanged(bool st, const QString& info = "");
void newOutput(const QString& output);
void changeClientType(Util::ClientType);
};

6
common/util.cpp
View File

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

12
common/util.h
View File

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

2
ui/mainwindow.cpp
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;
setState(st);

4
ui/mainwindow.h
View File

@ -47,7 +47,7 @@ public slots:
void refreshOutput(const QString& output);
void refreshCMD(const QString& cmd);
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);
private slots:
@ -179,7 +179,7 @@ private:
void setState(bool st);
void saveClientPath(const QString& path);
signals:
void connectPM3(const QString path, const QString port);
void connectPM3(const QString& path, const QString& port);
void killPM3();
void setSerialListener(const QString& name, bool state);
};

5
ui/mf_attack_hardnesteddialog.h
View File

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

2
ui/mf_sim_simdialog.h
View File

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

5
ui/mf_uid_parameterdialog.h
View File

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