Changeset 3357 in ntrip for trunk

Timestamp:

Aug 22, 2011, 4:17:09 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncsslconfig.cpp (modified) (2 diffs)
• bncsslconfig.h (modified) (1 diff)
• bncwindow.cpp (modified) (2 diffs)

trunk/BNC/bncsslconfig.cpp

@@ -25 +25 @@
 {
 
-  QString dirName =  QDir::homePath() + QDir::separator() 
-                  + ".config" + QDir::separator() + qApp->organizationName();
+  std::cout << "HAHAHA" << std::endl;
+
+  QString dirName =  defaultPath();
 
   QList<QSslCertificate> caCerts = this->caCertificates();
@@ -51 +52 @@
 }
 
+// Destructor
+////////////////////////////////////////////////////////////////////////////
+QString bncSslConfig::defaultPath() {
+  return QDir::homePath() + QDir::separator() 
+         + ".config" + QDir::separator() + qApp->organizationName();
+}
+

trunk/BNC/bncsslconfig.h

@@ -12 +12 @@
     return _sslConfig;
   }
+  static QString defaultPath();
  private:
   bncSslConfig();

trunk/BNC/bncwindow.cpp

@@ -58 +58 @@
 #include "bncversion.h"
 #include "bncbytescounter.h"
+#include "bncsslconfig.h"
 #include "upload/bnccustomtrafo.h"
 #include "upload/bncephuploadcaster.h"
@@ -689 +690 @@
   pLayout->addWidget(new QLabel("Path to SSL Certificates"),     5, 0);
   pLayout->addWidget(_sslCaCertPathLineEdit,                     5, 1, 1,10);
+  pLayout->addWidget(new QLabel("default:  " + bncSslConfig::defaultPath()), 5, 12, 1,20);
   pLayout->addWidget(new QLabel("Ignore SSL Authorization Errors"), 6,0);
   pLayout->addWidget(_ignoreSslErrorsCheckBox,                     6, 1, 1,10);