Some minor fixes to the functions

functions.cpp

@@ -115,25 +115,23 @@ void mySortDelta(QString &a, QString &b, QString &c) {
 // Functions for the dice roller
 //========================================================
 
-//This is the correct dice roller
+#include <iostream>
+using namespace std;
 void MainWindow::diceAlpha(){
     int total = diceFinal01 + diceFinal02 + 2;
     line[0]->setText(QString::number(total));
 }
 
-//This version sums the first dice twice
 void MainWindow::diceBeta(){
     int total = diceFinal01 + diceFinal01 + 2;
     line[0]->setText(QString::number(total));
 }
 
-//This one substracts the second dice to the first one
 void MainWindow::diceGamma(){
     int total = diceFinal01 - diceFinal02;
     line[0]->setText(QString::number(total));
 }
 
-//This one takes the number 6 as a 12
 void MainWindow::diceDelta(){
     int total = diceFinal01 + diceFinal02;
     line[0]->setText(QString::number(total));
@@ -402,7 +400,10 @@ bool validZuluTime(const QString &time, const QString &zone, int &hours, int &mi
     if (hours < 0 || hours > 23 || minutes < 0 || minutes > 59)
         return false;
 
-    if (zone.length() < 1 || !zone[0].isLetter()  || toupper(zone.toStdString()[0]) ==  'J') return false;
+    if (zone.length() < 1 || zone[0] < 'A' ||
+        zone[0] > 'Z'  || toupper(zone.toStdString()[0]) ==  'J')
+        return false;
+
     return true;
 }
 
@@ -437,7 +438,13 @@ QString zuluBeta(int hours, int minutes, char zone) {
 
     hours = (hours + (24 + diff) ) % 24;
 
-    return QString::number(hours)  + QString::number(minutes);
+    QString qstHours = QString::number(hours);
+    if (qstHours.length() == 1) qstHours.prepend("0");
+
+    QString qstMin = QString::number(minutes);
+    if (qstMin.length() == 1) qstMin.prepend("0");
+
+    return qstHours + qstMin;
 }
 
 QString zuluGamma(int hours, int minutes, char zone) {
@@ -448,9 +455,15 @@ QString zuluGamma(int hours, int minutes, char zone) {
     else if (zone <= 'Y')     diff = -(zone - 'N');
     else                      diff = 0;
 
-    hours = (hours + (24 - diff) ) % 24;
+    hours = (hours + (24 + diff) ) % 24;
 
-    return QString::number(hours) + QString::number(minutes);
+    QString qstHours = QString::number(hours);
+    if (qstHours.length() == 1) qstHours.prepend("0");
+
+    QString qstMin = QString::number(minutes);
+    if (qstMin.length() == 1) qstMin.prepend("0");
+
+    return qstHours + qstMin;
 }
 
 QString zuluDelta(int hours, int minutes, char zone) {
@@ -462,7 +475,13 @@ QString zuluDelta(int hours, int minutes, char zone) {
 
     hours = (hours + (24 - diff) ) % 24;
 
-    return QString::number(hours)  + QString::number(minutes);
+    QString qstHours = QString::number(hours);
+    if (qstHours.length() == 1) qstHours.prepend("0");
+
+    QString qstMin = QString::number(minutes);
+    if (qstMin.length() == 1) qstMin.prepend("0");
+
+    return qstHours + qstMin;
 }
 
 

mainwindow.cpp

@@ -389,11 +389,11 @@ void MainWindow::paintDice() {
         diceFinal01 = a;
         diceFinal02 = b;
         if (option == "Version Alpha")
-            diceBeta();
+            diceAlpha();
         else if (option == "Version Beta")
-            diceGamma();
+            diceBeta();
         else if (option == "Version Gamma")
-            diceAlpha();
+            diceGamma();
         else
             diceAlpha();
     }