Merge branch 'flipmcf-Qt-upgrade' into v4

This commit is contained in:
Fred Gleason
2024-12-04 11:44:52 -05:00
10 changed files with 15 additions and 16 deletions

View File

@@ -85,8 +85,7 @@ bool RDReport::ExportResultsReport(const QString &filename,
*strm << QString::asprintf("%03d,",q->value(4).toInt());
// Title / Artist
*strm << QString().
sprintf("\"%-23s %-25s\",",
*strm << QString::asprintf("\"%-23s %-25s\",",
q->value(5).toString().left(23).toUtf8().constData(),
q->value(6).toString().left(25).toUtf8().constData());

View File

@@ -32,7 +32,7 @@ class RDBusyBar : public QFrame
Q_OBJECT
public:
RDBusyBar(QWidget *parent=0,Qt::WindowFlags f=0);
RDBusyBar(QWidget *parent=0,Qt::WindowFlags f=Qt::WindowFlags());
public slots:
void activate(bool state);

View File

@@ -28,7 +28,7 @@ class RDBusyDialog : public RDDialog
{
Q_OBJECT;
public:
RDBusyDialog(QWidget *parent=0,Qt::WindowFlags f=0);
RDBusyDialog(QWidget *parent=0,Qt::WindowFlags f=Qt::WindowFlags());
~RDBusyDialog();
QSize sizeHint() const;
void show(const QString &caption,const QString &label);

View File

@@ -29,8 +29,8 @@ class RDDialog : public QDialog, public RDFontEngine
{
Q_OBJECT;
public:
RDDialog(QWidget *parent=0,Qt::WindowFlags f=0);
RDDialog(RDConfig *config,QWidget *parent=0,Qt::WindowFlags f=0);
RDDialog(QWidget *parent=0,Qt::WindowFlags f=Qt::WindowFlags());
RDDialog(RDConfig *config,QWidget *parent=0,Qt::WindowFlags f=Qt::WindowFlags());
};

View File

@@ -29,8 +29,8 @@ class RDFrame : public QFrame, public RDFontEngine
{
Q_OBJECT;
public:
RDFrame(QWidget *parent=0,Qt::WindowFlags f=0);
RDFrame(RDConfig *config,QWidget *parent=0,Qt::WindowFlags f=0);
RDFrame(QWidget *parent=0,Qt::WindowFlags f=Qt::WindowFlags());
RDFrame(RDConfig *config,QWidget *parent=0,Qt::WindowFlags f=Qt::WindowFlags());
};

View File

@@ -34,8 +34,8 @@ class RDMainWindow : public RDWidget
{
Q_OBJECT;
public:
RDMainWindow(const QString &cmdname,Qt::WindowFlags f=0);
RDMainWindow(const QString &cmdname,RDConfig *c,Qt::WindowFlags f=0);
RDMainWindow(const QString &cmdname,Qt::WindowFlags f=Qt::WindowFlags());
RDMainWindow(const QString &cmdname,RDConfig *c,Qt::WindowFlags f=Qt::WindowFlags());
~RDMainWindow();
bool loadSettings(bool apply_geometry);
bool saveSettings() const;

View File

@@ -136,7 +136,7 @@ void RDTimeEdit::fixup(QString &input) const
// Don't allow higher precision than tenths of a second
//
if(d_show_tenths) {
QStringList f0=input.split(".",QString::KeepEmptyParts);
QStringList f0=input.split(".",Qt::KeepEmptyParts);
if(f0.size()==2) {
QStringList f1=f0.at(1).split(" ");
if(f1.at(0).length()>1) {
@@ -206,7 +206,7 @@ void RDTimeEdit::stepBy(int steps)
d_step_enabled=QTimeEdit::stepEnabled();
}
else {
d_step_enabled=0;
d_step_enabled=StepNone;
if(tenths>tenths_lo_limit) {
d_step_enabled=d_step_enabled|StepDownEnabled;
}

View File

@@ -29,8 +29,8 @@ class RDWidget : public QWidget, public RDFontEngine
{
Q_OBJECT;
public:
RDWidget(QWidget *parent=0,Qt::WindowFlags f=0);
RDWidget(RDConfig *config,QWidget *parent=0,Qt::WindowFlags f=0);
RDWidget(QWidget *parent=0,Qt::WindowFlags f=Qt::WindowFlags());
RDWidget(RDConfig *config,QWidget *parent=0,Qt::WindowFlags f=Qt::WindowFlags());
QPixmap backgroundPixmap() const;
void setBackgroundPixmap(const QPixmap &pix);

View File

@@ -31,7 +31,7 @@ class VBox : public QWidget
{
Q_OBJECT
public:
VBox(QWidget *parent=0,Qt::WindowFlags f=0);
VBox(QWidget *parent=0,Qt::WindowFlags f=Qt::WindowFlags());
void addWidget(QWidget *widget);
void setSpacing(int space);

View File

@@ -27,7 +27,7 @@ class MainWindow : public RDMainWindow
{
Q_OBJECT;
public:
MainWindow(const QString &cmdname,RDConfig *c,Qt::WindowFlags f=0);
MainWindow(const QString &cmdname,RDConfig *c,Qt::WindowFlags f=Qt::WindowFlags());
bool showNoteBubbles() const;
void setShowNoteBubbles(bool state);
bool dragEnabled() const;