From 1fe517c589e886fdbf5ca10a8aac7a318b37d451 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paraelsystems.com>
Date: Wed, 15 Aug 2018 14:17:04 +0000
Subject: [PATCH] 2018-08-15 Fred Gleason <fredg@paravelsystems.com> 	*
 Fixed style inconsistencies in dialogs within rdmonitor(1).

---
 ChangeLog                    | 2 ++
 rdmonitor/positiondialog.cpp | 9 +++------
 rdmonitor/positiondialog.h   | 5 +----
 rdmonitor/rdmonitor.cpp      | 7 +------
 rdmonitor/rdmonitor.h        | 2 +-
 rdmonitor/status_tip.cpp     | 2 +-
 rdmonitor/status_tip.h       | 2 +-
 7 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9eed31f8..c4fecd3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17404,3 +17404,5 @@
 	* Fixed style inconsistencies in dialogs within rdlogin(1).
 2018-08-14 Fred Gleason <fredg@paravelsystems.com>
 	* Fixed style inconsistencies in dialogs within rdlogmanager(1).
+2018-08-15 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed style inconsistencies in dialogs within rdmonitor(1).
diff --git a/rdmonitor/positiondialog.cpp b/rdmonitor/positiondialog.cpp
index 56ae04a8..1d59a72a 100644
--- a/rdmonitor/positiondialog.cpp
+++ b/rdmonitor/positiondialog.cpp
@@ -2,7 +2,7 @@
 //
 // Dialog to set RDMonitor screen position.
 //
-//   (C) Copyright 2013,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2013-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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
@@ -19,19 +19,16 @@
 //
 
 #include "positiondialog.h"
-//Added by qt3to4:
-#include <QResizeEvent>
-#include <QLabel>
-#include <QCloseEvent>
 
 PositionDialog::PositionDialog(QDesktopWidget *dw,RDMonitorConfig *config,
 			       QWidget *parent)
   : QDialog(parent)
 {
+  setModal(true);
   pos_desktop_widget=dw;
   pos_config=config;
 
-  setCaption("RDMonitor");
+  setWindowTitle("RDMonitor");
 
   //
   // Fonts
diff --git a/rdmonitor/positiondialog.h b/rdmonitor/positiondialog.h
index 65530863..33e352ad 100644
--- a/rdmonitor/positiondialog.h
+++ b/rdmonitor/positiondialog.h
@@ -2,7 +2,7 @@
 //
 // Dialog to set RDMonitor screen position.
 //
-//   (C) Copyright 2013,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2013-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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
@@ -27,9 +27,6 @@
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qspinbox.h>
-//Added by qt3to4:
-#include <QResizeEvent>
-#include <QCloseEvent>
 
 #include <rdmonitor_config.h>
 
diff --git a/rdmonitor/rdmonitor.cpp b/rdmonitor/rdmonitor.cpp
index fdbc4daa..1fad0ab1 100644
--- a/rdmonitor/rdmonitor.cpp
+++ b/rdmonitor/rdmonitor.cpp
@@ -2,7 +2,7 @@
 //
 // System Monitor for Rivendell
 //
-//   (C) Copyright 2012,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2012-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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
@@ -35,11 +35,6 @@
 #include <qdir.h>
 #include <qsignalmapper.h>
 #include <qsqldatabase.h>
-//Added by qt3to4:
-#include <QPaintEvent>
-#include <QResizeEvent>
-#include <QPixmap>
-#include <QMouseEvent>
 
 #include <dbversion.h>
 #include <rd.h>
diff --git a/rdmonitor/rdmonitor.h b/rdmonitor/rdmonitor.h
index 64823b0d..a871b698 100644
--- a/rdmonitor/rdmonitor.h
+++ b/rdmonitor/rdmonitor.h
@@ -2,7 +2,7 @@
 //
 // System Monitor Applet for Rivendell
 //
-//   (C) Copyright 2012,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2012-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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
diff --git a/rdmonitor/status_tip.cpp b/rdmonitor/status_tip.cpp
index 0e03798b..d71838aa 100644
--- a/rdmonitor/status_tip.cpp
+++ b/rdmonitor/status_tip.cpp
@@ -2,7 +2,7 @@
 //
 // Custom ToolTip for RDMonitor's Status Bubble
 //
-//   (C) Copyright 2012,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2012-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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
diff --git a/rdmonitor/status_tip.h b/rdmonitor/status_tip.h
index ced3b521..e118b3b4 100644
--- a/rdmonitor/status_tip.h
+++ b/rdmonitor/status_tip.h
@@ -2,7 +2,7 @@
 //
 // Custom ToolTip for RDMonitor's Status Bubble
 //
-//   (C) Copyright 2012,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2012-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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