[pan: 12/22] Merge branch 'initialiser-ordering' into cppcheck




commit 1363393538227339fc40668b5a65c98b4aca8668
Merge: ad97a49 6f38623
Author: Thomas Tanner <thosrtanner googlemail com>
Date:   Sun Jul 3 22:39:38 2022 +0100

    Merge branch 'initialiser-ordering' into cppcheck
    
    # Conflicts:
    #       pan/tasks/decoder.cc
    #       pan/tasks/encoder.cc

 pan/data-impl/data-impl.cc       | 11 +++++-----
 pan/data/data.h                  |  2 +-
 pan/general/log.h                |  2 +-
 pan/gui/body-pane.cc             | 10 ++++-----
 pan/gui/gui.cc                   |  8 ++++----
 pan/gui/header-pane.cc           |  6 +++---
 pan/gui/pan.cc                   |  4 ++--
 pan/gui/post-ui.cc               | 39 +++++++++++++++++++++++------------
 pan/gui/progress-view.cc         |  4 ++--
 pan/tasks/decoder.cc             | 10 ++-------
 pan/tasks/encoder.cc             | 32 ++++-------------------------
 pan/tasks/nntp-pool.cc           |  6 +++---
 pan/tasks/queue.cc               |  6 +++---
 pan/tasks/socket-impl-openssl.cc |  4 ++--
 pan/tasks/task-article.cc        |  4 ++--
 pan/tasks/task-upload.cc         | 16 +++++++--------
 po/pl.po                         | 44 ++++++++++++++++++++--------------------
 17 files changed, 96 insertions(+), 112 deletions(-)
---
diff --cc pan/tasks/decoder.cc
index 30bae8e,7b3eb8a..b5eb4a0
--- a/pan/tasks/decoder.cc
+++ b/pan/tasks/decoder.cc
@@@ -35,19 -33,14 +35,13 @@@
  #include <pan/general/file-util.h>
  #include <pan/general/macros.h>
  #include <pan/general/utf8-utils.h>
 -#include "decoder.h"
  
 -using namespace pan;
 +namespace pan {
  
  Decoder :: Decoder (WorkerPool& pool):
-   mark_read(false),
-   task(nullptr),
-   save_mode(TaskArticle::NONE),
-   options(TaskArticle::SAVE_AS),
-   percent(0.0),
-   num_scanned_files(0),
+   health(OK),
    _worker_pool (pool),
-   _gsourceid (-1),
-   health(OK)
+   _gsourceid (-1)
  {
  }
  
diff --cc pan/tasks/encoder.cc
index e197e6c,c77ae6c..0c1775d
--- a/pan/tasks/encoder.cc
+++ b/pan/tasks/encoder.cc
@@@ -43,44 -41,15 +43,20 @@@ extern "C" 
  #include <pan/general/file-util.h>
  #include <pan/general/macros.h>
  #include <pan/general/utf8-utils.h>
 -#include "encoder.h"
  
 -using namespace pan;
 +namespace pan {
  
- /*
-            ^
- pan\tasks\encoder.cc:49:12: warning: Member variable 'Encoder::parts' is not initialized in the 
constructor. [uninitMemberVar]
- Encoder :: Encoder (WorkerPool& pool):
-            ^
- pan\tasks\encoder.cc:49:12: warning: Member variable 'Encoder::task' is not initialized in the constructor. 
[uninitMemberVar]
- Encoder :: Encoder (WorkerPool& pool):
-            ^
- pan\tasks\encoder.cc:49:12: warning: Member variable 'Encoder::bpf' is not initialized in the constructor. 
[uninitMemberVar]
- Encoder :: Encoder (WorkerPool& pool):
-            ^
- pan\tasks\encoder.cc:49:12: warning: Member variable 'Encoder::cache' is not initialized in the 
constructor. [uninitMemberVar]
- Encoder :: Encoder (WorkerPool& pool):
-            ^
- pan\tasks\encoder.cc:49:12: warning: Member variable 'Encoder::needed' is not initialized in the 
constructor. [uninitMemberVar]
- Encoder :: Encoder (WorkerPool& pool):
-            ^
- pan\tasks\encoder.cc:49:12: warning: Member variable 'Encoder::article' is not initialized in the 
constructor. [uninitMemberVar]
- Encoder :: Encoder (WorkerPool& pool):
-            ^
- pan\tasks\encoder.cc:49:12: warning: Member variable 'Encoder::percent' is not initialized in the 
constructor. [uninitMemberVar]
- Encoder :: Encoder (WorkerPool& pool):
-            ^
- */
+ 
  Encoder :: Encoder (WorkerPool& pool):
+   health(OK),
 -  _worker_pool (pool),
 +  parts(0),
 +  task(nullptr),
 +  bpf(0),
 +  cache(nullptr),
 +  needed(nullptr),
 +  article(nullptr),
-   percent(0.0),
-   _worker_pool (pool),
-   _gsourceid (-1),
-   health(OK)
++  percent(0.0),  _worker_pool (pool),
+   _gsourceid (-1)
  {}
  
  


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]