diff --git a/ChangeLog b/ChangeLog index 8639de2a..7a1a6d2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17438,3 +17438,5 @@ 2018-08-16 Fred Gleason * Fixed style inconsistencies in dialogs within rdgpimon(1). * Fixed style inconsistencies in dialogs within rdpopup(1). +2018-08-16 Fred Gleason + * Fixed style inconsistencies in dialogs within rdsoftkeys(1). diff --git a/utils/rdsoftkeys/rdsoftkeys.cpp b/utils/rdsoftkeys/rdsoftkeys.cpp index 3a32c8ae..8a6e03c6 100644 --- a/utils/rdsoftkeys/rdsoftkeys.cpp +++ b/utils/rdsoftkeys/rdsoftkeys.cpp @@ -2,7 +2,7 @@ // // A utility for sending RML Commands // -// (C) Copyright 2002-2006,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -51,7 +51,7 @@ #include "../icons/rivendell-22x22.xpm" MainWidget::MainWidget(QWidget *parent) - : Q3MainWindow(parent) + : QWidget(parent) { key_ysize=70; @@ -78,7 +78,7 @@ MainWidget::MainWidget(QWidget *parent) QFont label_font("Helvetica",18,QFont::Bold); label_font.setPixelSize(18); - setCaption(QString("RDSoftKeys")+" v"+VERSION); + setWindowTitle(QString("RDSoftKeys")+" v"+VERSION); // // Create And Set Icon diff --git a/utils/rdsoftkeys/rdsoftkeys.h b/utils/rdsoftkeys/rdsoftkeys.h index f30954cd..b5049c8a 100644 --- a/utils/rdsoftkeys/rdsoftkeys.h +++ b/utils/rdsoftkeys/rdsoftkeys.h @@ -2,7 +2,7 @@ // // A utility for sending RML Commands // -// (C) Copyright 2002-2006,2016 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -23,13 +23,11 @@ #include -#include #include #include #include #include -//Added by qt3to4: -#include +#include #include @@ -39,7 +37,7 @@ #define RDSOFTKEYS_USAGE "[--map-file=]\n\nWhere is the name of the file load soft key definitions from.\nThe default value is master Rivendell configuration file.\n" #define RDSOFTKEYS_DEFAULT_COLUMNS 1 -class MainWidget : public Q3MainWindow +class MainWidget : public QWidget { Q_OBJECT public: