From 18e1098e3849609f2f579137125caf06b8aca7d6 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Mon, 12 Aug 2019 12:44:08 +0200 Subject: [PATCH] Remove maxLogLines config option It's no longer used. For owncloud/docs#1365 --- doc/conffile.rst | 2 -- src/libsync/configfile.cpp | 14 -------------- src/libsync/configfile.h | 4 ---- 3 files changed, 20 deletions(-) diff --git a/doc/conffile.rst b/doc/conffile.rst index 87eeccaa3..b5fa66157 100644 --- a/doc/conffile.rst +++ b/doc/conffile.rst @@ -51,8 +51,6 @@ Some interesting values that can be set on the configuration file are: +---------------------------------+------------------------+--------------------------------------------------------------------------------------------------------+ | ``promptDeleteAllFiles`` | ``true`` | If a UI prompt should ask for confirmation if it was detected that all files and folders were deleted. | +---------------------------------+------------------------+--------------------------------------------------------------------------------------------------------+ -| ``maxLogLines`` | ``20000`` | Specifies the maximum number of log lines displayed in the log window. | -+---------------------------------+------------------------+--------------------------------------------------------------------------------------------------------+ | ``timeout`` | ``300`` | The timeout for network connections in seconds. | +---------------------------------+------------------------+--------------------------------------------------------------------------------------------------------+ | ``moveToTrash`` | ``false`` | If non-locally deleted files should be moved to trash instead of deleting them completely. | diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index 1046a6934..bc4ab69b4 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -101,7 +101,6 @@ static const char useNewBigFolderSizeLimitC[] = "useNewBigFolderSizeLimit"; static const char confirmExternalStorageC[] = "confirmExternalStorage"; static const char moveToTrashC[] = "moveToTrash"; -static const char maxLogLinesC[] = "Logging/maxLogLines"; const char certPath[] = "http_certificatePath"; const char certPasswd[] = "http_certificatePasswd"; @@ -673,19 +672,6 @@ void ConfigFile::setUpdateChannel(const QString &channel) settings.setValue(QLatin1String(updateChannelC), channel); } -int ConfigFile::maxLogLines() const -{ - QSettings settings(configFile(), QSettings::IniFormat); - return settings.value(QLatin1String(maxLogLinesC), DEFAULT_MAX_LOG_LINES).toInt(); -} - -void ConfigFile::setMaxLogLines(int lines) -{ - QSettings settings(configFile(), QSettings::IniFormat); - settings.setValue(QLatin1String(maxLogLinesC), lines); - settings.sync(); -} - void ConfigFile::setProxyType(int proxyType, const QString &host, int port, bool needsAuth, diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h index 6a292e54b..043e5342c 100644 --- a/src/libsync/configfile.h +++ b/src/libsync/configfile.h @@ -65,10 +65,6 @@ public: bool passwordStorageAllowed(const QString &connection = QString()); - // max count of lines in the log window - int maxLogLines() const; - void setMaxLogLines(int); - /* Server poll interval in milliseconds */ std::chrono::milliseconds remotePollInterval(const QString &connection = QString()) const; /* Set poll interval. Value in milliseconds has to be larger than 5000 */ -- 2.30.2