Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-13 08:05:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into RDImport

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Patrick Linstruth
2018-10-17 08:43:20 -07:00
parent 9cf8ad6fd0 2ba30d10c4
commit c265cc6044
162 changed files with 8552 additions and 18831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/rdconfig.h
View File

@@ -61,8 +61,6 @@ class RDConfig
QString mysqlDriver() const;
int mysqlHeartbeatInterval() const;
QString mysqlEngine() const;
QString mysqlCharset() const;
QString mysqlCollation() const;
QString createTablePostfix() const;
RDConfig::LogFacility logFacility() const;
void setLogFacility(RDConfig::LogFacility log_facility);
@@ -123,9 +121,7 @@ class RDConfig
void load();
void clear();
static QString userAgent(const QString &modname);
static QString createTablePostfix(const QString &engine,
const QString &charset,
const QString &collation);
static QString createTablePostfix(const QString &engine);
private:
QString conf_filename;
@@ -136,8 +132,6 @@ class RDConfig
QString conf_mysql_password;
QString conf_mysql_driver;
QString conf_mysql_engine;
QString conf_mysql_charset;
QString conf_mysql_collation;
QString conf_create_table_postfix;
int conf_mysql_heartbeat_interval;
RDConfig::LogFacility conf_log_facility;