Merge pull request #6703 from evsh/cmake

cmake: set warning and error compiler options

src/CMakeLists.txt

@@ -2,6 +2,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_CXX_STANDARD "11")
 add_definitions(-DBOOST_NO_CXX11_RVALUE_REFERENCES)
 
+include(MacroQbtCompilerSettings)
+qbt_set_compiler_options()
+
 include(MacroLinkQtComponents)
 include(QbtTargetSources)
 

src/app/stacktrace.h

@@ -9,16 +9,18 @@
 #include <execinfo.h>
 #include <cxxabi.h>
 
+#include <vector>
+
 /** Print a demangled stack backtrace of the caller function to FILE* out. */
 static inline void print_stacktrace(FILE *out = stderr, unsigned int max_frames = 63)
 {
     fprintf(out, "stack trace:\n");
 
     // storage array for stack trace address data
-    void *addrlist[max_frames + 1];
+    std::vector<void *> addrlist(max_frames + 1);
 
     // retrieve current stack addresses
-    int addrlen = backtrace(addrlist, sizeof(addrlist) / sizeof(void *));
+    int addrlen = backtrace(addrlist.data(), addrlist.size());
 
     if (addrlen == 0) {
         fprintf(out, "  <empty, possibly corrupt>\n");
@@ -27,7 +29,7 @@ static inline void print_stacktrace(FILE *out = stderr, unsigned int max_frames
 
     // resolve addresses into strings containing "filename(function+address)",
     // this array must be free()-ed
-    char * *symbollist = backtrace_symbols(addrlist, addrlen);
+    char * *symbollist = backtrace_symbols(addrlist.data(), addrlen);
 
     // allocate string which will be filled with the demangled function name
     size_t funcnamesize = 256;

src/base/net/private/geoipdatabase.h

@@ -96,7 +96,7 @@ private:
     // Search data
     mutable QHash<quint32, QString> m_countries;
     quint32 m_size;
-    const uchar *m_data;
+    uchar *m_data;
 };
 
 #endif // GEOIPDATABASE_H

src/webui/abstractwebapplication.cpp

@@ -121,7 +121,7 @@ Http::Response AbstractWebApplication::processRequest(const Http::Request &reque
         print(QObject::tr("Your IP address has been banned after too many failed authentication attempts."), Http::CONTENT_TYPE_TXT);
     }
     else {
-        processRequest();
+        doProcessRequest();
     }
 
     return response();

src/webui/abstractwebapplication.h

@@ -54,10 +54,10 @@ public:
     explicit AbstractWebApplication(QObject *parent = 0);
     virtual ~AbstractWebApplication();
 
-    Http::Response processRequest(const Http::Request &request, const Http::Environment &env);
+    Http::Response processRequest(const Http::Request &request, const Http::Environment &env) final;
 
 protected:
-    virtual void processRequest() = 0;
+    virtual void doProcessRequest() = 0;
 
     bool isBanned() const;
     int failedAttempts() const;

src/webui/webapplication.cpp

@@ -814,7 +814,7 @@ bool WebApplication::isPublicScope()
     return (scope_ == DEFAULT_SCOPE || scope_ == VERSION_INFO);
 }
 
-void WebApplication::processRequest()
+void WebApplication::doProcessRequest()
 {
     scope_ = DEFAULT_SCOPE;
     action_ = DEFAULT_ACTION;

src/webui/webapplication.h

@@ -103,7 +103,7 @@ private:
     QString action_;
     QStringList args_;
 
-    void processRequest();
+    void doProcessRequest() override;
 
     bool isPublicScope();
     void parsePath();