Skip to content

Commit d81c1db

Browse files
committed
解决了迁移到Qt6后,由于旧特性弃用导致的Warning
1 parent 7c74b4d commit d81c1db

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

dogcom.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ void DogCom::FillConfig(QString a, QString p, QString m)
2727
mac_addr = m;
2828
}
2929

30-
void DogCom::print_packet(const char msg[], const unsigned char *packet, int length)
30+
void DogCom::print_packet(const char* msg, const unsigned char *packet, int length)
3131
{
3232
if (!log)
3333
return;

main.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
7272
#endif
7373

7474
SingleApplication::setQuitOnLastWindowClosed(false);
75-
SingleApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
75+
// SingleApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
7676

7777
qDebug() << "...main...";
7878

@@ -82,7 +82,9 @@ int main(int argc, char *argv[])
8282
a.setFont(font);
8383

8484
QTranslator translator;
85-
translator.load(":/ts/DrCOM_zh_CN.qm");
85+
if (!translator.load(":/ts/DrCOM_zh_CN.qm")) {
86+
qWarning() << "Failed to load translation file!";
87+
}
8688
a.installTranslator(&translator);
8789

8890
MainWindow w(&a);

mainwindow.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ void MainWindow::RestartDrcom()
152152
QProcess::startDetached(qApp->arguments()[0], qApp->arguments());
153153
qDebug() << "Restart done.";
154154
}
155-
else if(CURR_STATE==STATE_LOGGING)
156-
;// 正在登录时候退出,假装没看到,不理
155+
// else if(CURR_STATE==STATE_LOGGING)
156+
// 正在登录时候退出,假装没看到,不理
157157
}
158158

159159
void MainWindow::QuitDrcom()
@@ -171,8 +171,8 @@ void MainWindow::QuitDrcom()
171171
else if(CURR_STATE==STATE_OFFLINE)
172172
// qApp->quit();
173173
QTimer::singleShot(0, qApp, SLOT(quit()));
174-
else if(CURR_STATE==STATE_LOGGING)
175-
;// 正在登录时候退出,假装没看到,不理
174+
// else if(CURR_STATE==STATE_LOGGING)
175+
// 正在登录时候退出,假装没看到,不理
176176

177177
// qApp->quit()调用放到了注销响应那块
178178
}

singleinstance/singleapplication_p.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ SingleApplicationPrivate::~SingleApplicationPrivate()
8383
void SingleApplicationPrivate::genBlockServerName()
8484
{
8585
QCryptographicHash appData( QCryptographicHash::Sha256 );
86-
appData.addData( "SingleApplication", 17 );
86+
appData.addData( "SingleApplication");
8787
appData.addData( SingleApplication::app_t::applicationName().toUtf8() );
8888
appData.addData( SingleApplication::app_t::organizationName().toUtf8() );
8989
appData.addData( SingleApplication::app_t::organizationDomain().toUtf8() );
@@ -217,7 +217,7 @@ void SingleApplicationPrivate::connectToPrimary( int msecs, ConnectionType conne
217217
writeStream << blockServerName.toLatin1();
218218
writeStream << static_cast<quint8>(connectionType);
219219
writeStream << instanceNumber;
220-
quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
220+
quint16 checksum = qChecksum(QByteArrayView(initMsg.constData(), static_cast<quint32>(initMsg.length())));
221221
writeStream << checksum;
222222

223223
// The header indicates the message length that follows
@@ -239,8 +239,8 @@ void SingleApplicationPrivate::connectToPrimary( int msecs, ConnectionType conne
239239
quint16 SingleApplicationPrivate::blockChecksum()
240240
{
241241
return qChecksum(
242-
static_cast <const char *>( memory->data() ),
243-
offsetof( InstancesInfo, checksum )
242+
QByteArrayView((static_cast <const char *>(memory->data())),
243+
offsetof( InstancesInfo, checksum ))
244244
);
245245
}
246246

@@ -365,7 +365,7 @@ void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
365365
quint16 msgChecksum = 0;
366366
readStream >> msgChecksum;
367367

368-
const quint16 actualChecksum = qChecksum( msgBytes.constData(), static_cast<quint32>( msgBytes.length() - sizeof( quint16 ) ) );
368+
const quint16 actualChecksum = qChecksum( QByteArrayView(msgBytes.constData(), static_cast<quint32>( msgBytes.length() - sizeof( quint16 ) )) );
369369

370370
bool isValid = readStream.status() == QDataStream::Ok &&
371371
QLatin1String(latin1Name) == blockServerName &&

0 commit comments

Comments
 (0)