Remove maxLogLines config option

It's no longer used.

For owncloud/docs#1365

diff --git a/doc/conffile.rst b/doc/conffile.rst
index 87eeccaa3b12c40e4ed50d6661e4d27e4ae5d0cb..b5fa66157c973a523fd55c393e65f05fb91ee6d4 100644 (file)
--- 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 1046a69346d4a168fa48294c2b204d97368f610f..bc4ab69b4887fa51438644e1de43b1c760f2c29e 100644 (file)
--- 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 6a292e54bd9a211991058f4b6f81eba98b07e80f..043e5342cd11a0054e127cdffb770e532523164c 100644 (file)
--- 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 */