Changeset 7513 in ntrip for trunk/BNC/src

Timestamp:

Oct 16, 2015, 12:38:42 PM (9 years ago)

Author:

weber

Message:

Keyname 'ignoreSslErrors' changed to 'sslIngoreErrors'

Location:

trunk/BNC/src

Files:

• bnchelp.html (modified) (1 diff)
• bncmain.cpp (modified) (1 diff)
• bncnetqueryv2.cpp (modified) (2 diffs)
• bncnetqueryv2.h (modified) (1 diff)
• bncsettings.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (5 diffs)
• bncwindow.h (modified) (1 diff)

trunk/BNC/src/bnchelp.html

@@ -4566 +4566 @@
    proxyPort       {Proxy port [integer number]}
    sslCaCertPath   {Full path to SSL certificates [character string]}
-   ignoreSslErrors {Ignore SSL authorization errors [integer number: 0=no,2=yes]}
+   sslIgnoreErrors {Ignore SSL authorization errors [integer number: 0=no,2=yes]}
 
 General Panel keys:

trunk/BNC/src/bncmain.cpp

@@ -94 +94 @@
       "   proxyPort       {Proxy port [integer number]}\n"
       "   sslCaCertPath   {Full path to SSL certificates [character string]}\n"
-      "   ignoreSslErrors {Ignore SSL authorization errors [integer number: 0=no,2=yes]}\n"
+      "   sslIgnoreErrors {Ignore SSL authorization errors [integer number: 0=no,2=yes]}\n"
       "\n"
       "General Panel keys:\n"

trunk/BNC/src/bncnetqueryv2.cpp

@@ -38 +38 @@
 
   bncSettings settings;
-  _ignoreSslErrors = 
-     (Qt::CheckState(settings.value("ignoreSslErrors").toInt()) == Qt::Checked);
+  _sslIgnoreErrors = 
+     (Qt::CheckState(settings.value("sslIgnoreErrors").toInt()) == Qt::Checked);
 
   if (_secure && !QSslSocket::supportsSsl()) {
@@ -227 +227 @@
   BNC_CORE->slotMessage(msg.toAscii(), true);
 
-  if (_ignoreSslErrors) {
+  if (_sslIgnoreErrors) {
     _reply->ignoreSslErrors();
   }

trunk/BNC/src/bncnetqueryv2.h

@@ -30 +30 @@
   bool                   _firstData;
   bool                   _secure;
-  bool                   _ignoreSslErrors;
+  bool                   _sslIgnoreErrors;
 };
 

trunk/BNC/src/bncsettings.cpp

@@ -78 +78 @@
     setValue_p("proxyPort",           "");
     setValue_p("sslCaCertPath",       "");
-    setValue_p("ignoreSslErrors",     "0");
+    setValue_p("sslIgnoreErrors",     "0");
     // General
     setValue_p("logFile",             "");

trunk/BNC/src/bncwindow.cpp

@@ -174 +174 @@
 
   _sslCaCertPathLineEdit   = new QLineEdit(settings.value("sslCaCertPath").toString());
-  _ignoreSslErrorsCheckBox = new QCheckBox();
-  _ignoreSslErrorsCheckBox->setCheckState(Qt::CheckState(
-                                          settings.value("ignoreSslErrors").toInt()));
+  _sslIgnoreErrorsCheckBox = new QCheckBox();
+  _sslIgnoreErrorsCheckBox->setCheckState(Qt::CheckState(
+                                          settings.value("sslIgnoreErrors").toInt()));
 
   // General Options
@@ -646 +646 @@
   pLayout->addWidget(new QLabel("Default:  " + bncSslConfig::defaultPath()), 3,11, 1,20);
   pLayout->addWidget(new QLabel("Ignore SSL authorization errors"),          4, 0);
-  pLayout->addWidget(_ignoreSslErrorsCheckBox,                               4, 1, 1,10);
+  pLayout->addWidget(_sslIgnoreErrorsCheckBox,                               4, 1, 1,10);
   pLayout->addWidget(new QLabel(""),                                         5, 1);
   pLayout->setRowStretch(6, 999);
@@ -1295 +1295 @@
   _proxyPortLineEdit->setWhatsThis(tr("<p>Enter your proxy server port number in case a proxy is operated in front of BNC.</p>"));
   _sslCaCertPathLineEdit->setWhatsThis(tr("<p>Communication with an Ntrip broadcaster over SSL requires the exchange of client and/or server certificates. Specify the path to a directory where you save certificates on your system. Don't try communication via SSL if you are not sure wheter this is supported by the involved Ntrip broadcaster. Note that SSL communication is usually done over port 443.</p>"));
-  _ignoreSslErrorsCheckBox->setWhatsThis(tr("<p>SSL communication may involve queries coming from the Ntrip broadcaster. Tick 'Ignore SSL authorization erros' if you don't want to be bothered with this.</p>"));
+  _sslIgnoreErrorsCheckBox->setWhatsThis(tr("<p>SSL communication may involve queries coming from the Ntrip broadcaster. Tick 'Ignore SSL authorization erros' if you don't want to be bothered with this.</p>"));
   _outWaitSpinBox->setWhatsThis(tr("<p>When feeding a real-time GNSS network engine waiting for synchronized input epoch by epoch, BNC drops whatever is received later than 'Wait for full obs epoch' seconds. A value of 3 to 5 seconds is recommended, depending on the latency of the incoming streams and the delay acceptable to your real-time GNSS network engine or products.</p>"));
   _outFileLineEdit->setWhatsThis(tr("Specify the full path to a file where synchronized observations are saved in plain ASCII format. Beware that the size of this file can rapidly increase depending on the number of incoming streams."));
@@ -1501 +1501 @@
 
   settings.setValue("sslCaCertPath",   _sslCaCertPathLineEdit->text());
-  settings.setValue("ignoreSslErrors", _ignoreSslErrorsCheckBox->checkState());
+  settings.setValue("sslIgnoreErrors", _sslIgnoreErrorsCheckBox->checkState());
 
   QMessageBox msgBox;
@@ -1732 +1732 @@
   settings.setValue("proxyPort",   _proxyPortLineEdit->text());
   settings.setValue("sslCaCertPath",   _sslCaCertPathLineEdit->text());
-  settings.setValue("ignoreSslErrors",  _ignoreSslErrorsCheckBox->checkState());
+  settings.setValue("sslIgnoreErrors",  _sslIgnoreErrorsCheckBox->checkState());
 // General
   settings.setValue("logFile",     _logFileLineEdit->text());

trunk/BNC/src/bncwindow.h

@@ -128 +128 @@
     QLineEdit* _proxyPortLineEdit;
     QLineEdit* _sslCaCertPathLineEdit;
-    QCheckBox* _ignoreSslErrorsCheckBox;
+    QCheckBox* _sslIgnoreErrorsCheckBox;
     QLineEdit* _outFileLineEdit;
     QLineEdit* _outPortLineEdit;