From 9fabc0bd3cb496dc77c872993ea2b54cbd2e71bf Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 21 Feb 2012 19:06:08 +0100
Subject: globals in extra class, new javascript interface classes for fbgui
 and ndgui, various cleanups in ndgui...

---
 src/fbgui/fbgui.h | 43 -------------------------------------------
 1 file changed, 43 deletions(-)

(limited to 'src/fbgui/fbgui.h')

diff --git a/src/fbgui/fbgui.h b/src/fbgui/fbgui.h
index 8afb496..c300387 100644
--- a/src/fbgui/fbgui.h
+++ b/src/fbgui/fbgui.h
@@ -25,31 +25,6 @@
 
 #include "agui.h"
 
-// Internal default settings
-#define DEFAULT_URL "http://www.google.com"
-#define DEFAULT_DOWNLOAD_DIR "/tmp/fbgui"
-#define DEFAULT_CONFIG_PATH "/etc/fbgui.conf"
-#define DEFAULT_LOG_FILE_PATH "/tmp/fbgui.log"
-#define DEFAULT_UPDATE_INTERVAL 1;
-#define DEFAULT_QRC_HTML_DIR ":/html"
-#define DEFAULT_FILE_TRIGGER "/tmp/fbgui/trigger"
-#define DEFAULT_SSL_SUPPORT false;
-
-// Global settings variables
-extern QString logFilePath;
-extern QString ipConfigFilePath;
-extern QThread dmThread;
-extern QString serialLocation;
-extern QString fileToTriggerURL;
-extern QString sessionID;
-extern QString binPath;
-extern QString downloadPath;
-extern QUrl baseURL;
-extern int debugMode;
-extern int updateInterval;
-extern QString interfaceName;
-extern bool sslSupport;
-
 class fbgui : public agui
 {
   Q_OBJECT
@@ -65,32 +40,14 @@ private:
   bool checkHost() const;
   void loadURL();
 
-  //Dump all Certificates in SSLConfiguration
-  void dumpSSLConfiguration();
 
   QByteArray generatePOSTData();
 
   // QNetworkRequest for the Network Request
   QNetworkRequest* _qnr;
-  // List for expected SSL Errors, like selfsigned certificate error
-  QList<QSslError> _expectedSslErrors;
 private slots:
   void loadURLDone(bool success);
 
-  //SSL Error Handler for SSL Requests
-  void sslErrorHandler(QNetworkReply*, const QList<QSslError> &);
-
-  //Error Handler for http Requests
-  void httpErrorHandler(QNetworkReply*);
-
-  //Sets CaCertificates in QSslConfiguration
-  void setCACertificates(const QList<QSslCertificate> & );
-
-  //Sets LocalCertificate in QSslConfiguration
-  void setLocalCertificate(const QSslCertificate & );
-
-  //Sets PrivateKey in QSslConfiguration
-  void setPrivateKey(const QSslKey &);
   void loadSystem();
   // prepares kexec by loading downloaded initramfs, kernel into kexec
   void prepareKexec();
-- 
cgit v1.2.3-55-g7522