summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/base
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r--rbutil/rbutilqt/base/httpget.cpp4
-rw-r--r--rbutil/rbutilqt/base/httpget.h6
-rw-r--r--rbutil/rbutilqt/base/rbsettings.cpp1
-rw-r--r--rbutil/rbutilqt/base/rbsettings.h1
4 files changed, 1 insertions, 11 deletions
diff --git a/rbutil/rbutilqt/base/httpget.cpp b/rbutil/rbutilqt/base/httpget.cpp
index 05005ee6d3..66a7076391 100644
--- a/rbutil/rbutilqt/base/httpget.cpp
+++ b/rbutil/rbutilqt/base/httpget.cpp
@@ -24,7 +24,6 @@
QDir HttpGet::m_globalCache; //< global cach path value for new objects
QUrl HttpGet::m_globalProxy; //< global proxy value for new objects
-bool HttpGet::m_globalDumbCache = false; //< globally set cache "dumb" mode
QString HttpGet::m_globalUserAgent; //< globally set user agent for requests
HttpGet::HttpGet(QObject *parent)
@@ -32,7 +31,6 @@ HttpGet::HttpGet(QObject *parent)
{
outputToBuffer = true;
m_cached = false;
- m_dumbCache = m_globalDumbCache;
getRequest = -1;
headRequest = -1;
// if a request is cancelled before a reponse is available return some
@@ -213,7 +211,7 @@ bool HttpGet::getFile(const QUrl &url)
m_header.setValue("User-Agent", m_globalUserAgent);
m_header.setValue("Connection", "Keep-Alive");
- if(m_dumbCache || !m_usecache) {
+ if(!m_usecache) {
getFileFinish();
}
else {
diff --git a/rbutil/rbutilqt/base/httpget.h b/rbutil/rbutilqt/base/httpget.h
index e8a936de08..73d3fbbaf5 100644
--- a/rbutil/rbutilqt/base/httpget.h
+++ b/rbutil/rbutilqt/base/httpget.h
@@ -45,14 +45,10 @@ class HttpGet : public QObject
{ return m_cached; }
QDateTime timestamp(void)
{ return m_serverTimestamp; }
- void setDumbCache(bool b) //< disable checking of http header timestamp for caching
- { m_dumbCache = b; }
static void setGlobalCache(const QDir& d) //< set global cache path
{ m_globalCache = d; }
static void setGlobalProxy(const QUrl& p) //< set global proxy value
{ m_globalProxy = p; }
- static void setGlobalDumbCache(bool b) //< set "dumb" (ignore server status) caching mode
- { m_globalDumbCache = b; }
static void setGlobalUserAgent(const QString& u) //< set global user agent string
{ m_globalUserAgent = u; }
@@ -92,12 +88,10 @@ class HttpGet : public QObject
QString m_query; //< constructed query to pass http getter
QString m_path; //< constructed path to pass http getter
QString m_hash; //< caching hash
- bool m_dumbCache; //< true if caching should ignore the server header
QHttpRequestHeader m_header;
static QDir m_globalCache; //< global cache path value
static QUrl m_globalProxy; //< global proxy value
- static bool m_globalDumbCache; //< cache "dumb" mode global setting
static QString m_globalUserAgent; //< global user agent string
};
diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/rbutil/rbutilqt/base/rbsettings.cpp
index a42b33c1bd..4d3901fce3 100644
--- a/rbutil/rbutilqt/base/rbsettings.cpp
+++ b/rbutil/rbutilqt/base/rbsettings.cpp
@@ -69,7 +69,6 @@ const static struct {
{ RbSettings::TtsVoice, ":tts:/voice", "" },
{ RbSettings::EncoderPath, ":encoder:/encoderpath", "" },
{ RbSettings::EncoderOptions, ":encoder:/encoderoptions", "" },
- { RbSettings::CacheOffline, "offline", "false" },
{ RbSettings::CacheDisabled, "cachedisable", "false" },
{ RbSettings::TtsUseSapi4, "sapi/useSapi4", "false" },
{ RbSettings::EncoderNarrowBand, ":encoder:/narrowband", "false" },
diff --git a/rbutil/rbutilqt/base/rbsettings.h b/rbutil/rbutilqt/base/rbsettings.h
index 7aada6e78c..7255def5f0 100644
--- a/rbutil/rbutilqt/base/rbsettings.h
+++ b/rbutil/rbutilqt/base/rbsettings.h
@@ -66,7 +66,6 @@ class RbSettings : public QObject
WavtrimThreshold,
EncoderComplexity,
TtsSpeed,
- CacheOffline,
CacheDisabled,
TtsUseSapi4,
EncoderNarrowBand,