From 868e0fb559e8712a5ef163725c1044805564392c Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Sat, 26 Apr 2025 16:38:57 -0400 Subject: [PATCH] 2025-04-26 Fred Gleason * Cleaned up compiler warnings in 'rdadmin/'. Signed-off-by: Fred Gleason --- ChangeLog | 2 ++ rdadmin/edit_endpoint.cpp | 6 +++--- rdadmin/edit_image.cpp | 11 +++++------ rdadmin/list_images.cpp | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 80e734c0..fcc7e3b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24986,3 +24986,5 @@ * Cleaned up compiler warnings in 'cae/'. 2025-04-26 Fred Gleason * Cleaned up compiler warnings in 'importers/'. +2025-04-26 Fred Gleason + * Cleaned up compiler warnings in 'rdadmin/'. diff --git a/rdadmin/edit_endpoint.cpp b/rdadmin/edit_endpoint.cpp index 8d00461b..6169ba63 100644 --- a/rdadmin/edit_endpoint.cpp +++ b/rdadmin/edit_endpoint.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Endpoint // -// (C) Copyright 2002-2021 Fred Gleason +// (C) Copyright 2002-2025 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -165,8 +165,8 @@ void EditEndpoint::okData() sql=QString("update ")+edit_table+" set "+ "`NAME`='"+RDEscapeString(edit_endpoint_edit->text())+"',"+ QString::asprintf("`ENGINE_NUM`=%d,",edit_enginenum_edit->text().toInt())+ - QString(). - sprintf("`DEVICE_NUM`=%d ",edit_devicenum_edit->text().toInt(NULL,16))+ + QString::asprintf("`DEVICE_NUM`=%d ",edit_devicenum_edit->text(). + toInt(NULL,16))+ "where "+ QString::asprintf("`ID`=%d",edit_endpoint_id); RDSqlQuery::apply(sql); diff --git a/rdadmin/edit_image.cpp b/rdadmin/edit_image.cpp index 7c670d0b..46295ad7 100644 --- a/rdadmin/edit_image.cpp +++ b/rdadmin/edit_image.cpp @@ -2,7 +2,7 @@ // // View a pixmap image and modify its metadata // -// (C) Copyright 2020-2022 Fred Gleason +// (C) Copyright 2020-2025 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -22,8 +22,9 @@ #include #include -#include -#include +#include +#include +#include #include "edit_image.h" @@ -212,9 +213,7 @@ QSize EditImage::FittedSize(const QSize &img_size) const QSize EditImage::MaxFriendlyImageSize() const { - QDesktopWidget *dt=QApplication::desktop(); - QSize dsize(dt->screenGeometry(dt->screenNumber(this)).size()); - + QSize dsize=QGuiApplication::screens().at(0)->size(); return QSize(dsize.width()-EDIT_IMAGE_WIDTH_OFFSET, dsize.height()-EDIT_IMAGE_HEIGHT_OFFSET-100); } diff --git a/rdadmin/list_images.cpp b/rdadmin/list_images.cpp index 205aca92..1f032679 100644 --- a/rdadmin/list_images.cpp +++ b/rdadmin/list_images.cpp @@ -2,7 +2,7 @@ // // Manage a collection of pixmap images // -// (C) Copyright 2020-2021 Fred Gleason +// (C) Copyright 2020-2025 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -120,7 +120,7 @@ void ListImages::addData() // // Upload the image // - f0=filename.split(".",QString::SkipEmptyParts); + f0=filename.split(".",Qt::SkipEmptyParts); if(!list_feed->postImage(img_id)) { QMessageBox::warning(this,"RDAdmin - "+tr("Upload Error"), tr("Image upload failed!")+"\n"+ @@ -142,7 +142,7 @@ void ListImages::addData() // // Save import path // - f0=filename.split("/",QString::SkipEmptyParts); + f0=filename.split("/",Qt::SkipEmptyParts); f0.removeLast(); list_file_dir=f0.join("/"); }