shiboken6: Brush up class FileOut

Rename member variables according to m_ convention, add setters
and getters. Remove unused API and inheritance of QObject.

Change-Id: I9fbde5c17c2ad38c672620fb4a6525c6f1a13c2a
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

3 files changed, 33 insertions, 50 deletions

diff --git a/sources/shiboken6/ApiExtractor/fileout.cpp b/sources/shiboken6/ApiExtractor/fileout.cpp
index b35693a38..3c00e3903 100644
--- a/sources/shiboken6/ApiExtractor/fileout.cpp
+++ b/sources/shiboken6/ApiExtractor/fileout.cpp
@@ -36,8 +36,8 @@
 
 #include <cstdio>
 
-bool FileOut::dummy = false;
-bool FileOut::diff = false;
+bool FileOut::m_dryRun = false;
+bool FileOut::m_diff = false;
 
 #ifdef Q_OS_LINUX
 static const char colorDelete[] = "\033[31m";
@@ -52,15 +52,15 @@ static const char colorReset[] = "";
 #endif
 
 FileOut::FileOut(QString n) :
-    name(std::move(n)),
-    stream(&tmp),
-    isDone(false)
+    stream(&m_buffer),
+    m_name(std::move(n)),
+    m_isDone(false)
 {
 }
 
 FileOut::~FileOut()
 {
-    if (!isDone)
+    if (!m_isDone)
         done();
 }
 
@@ -181,17 +181,17 @@ FileOut::State FileOut::done()
 
 FileOut::State FileOut::done(QString *errorMessage)
 {
-    Q_ASSERT(!isDone);
-    if (name.isEmpty())
+    Q_ASSERT(!m_isDone);
+    if (m_name.isEmpty())
         return Failure;
 
-    isDone = true;
+    m_isDone = true;
     bool fileEqual = false;
-    QFile fileRead(name);
+    QFile fileRead(m_name);
     QFileInfo info(fileRead);
     stream.flush();
     QByteArray original;
-    if (info.exists() && (diff || (info.size() == tmp.size()))) {
+    if (info.exists() && (m_diff || (info.size() == m_buffer.size()))) {
         if (!fileRead.open(QIODevice::ReadOnly)) {
             *errorMessage = msgCannotOpenForReading(fileRead);
             return Failure;
@@ -199,13 +199,13 @@ FileOut::State FileOut::done(QString *errorMessage)
 
         original = fileRead.readAll();
         fileRead.close();
-        fileEqual = (original == tmp);
+        fileEqual = (original == m_buffer);
     }
 
     if (fileEqual)
         return Unchanged;
 
-    if (!FileOut::dummy) {
+    if (!FileOut::m_dryRun) {
         QDir dir(info.absolutePath());
         if (!dir.mkpath(dir.absolutePath())) {
             *errorMessage = QStringLiteral("unable to create directory '%1'")
@@ -213,36 +213,21 @@ FileOut::State FileOut::done(QString *errorMessage)
             return Failure;
         }
 
-        QFile fileWrite(name);
+        QFile fileWrite(m_name);
         if (!fileWrite.open(QIODevice::WriteOnly)) {
             *errorMessage = msgCannotOpenForWriting(fileWrite);
             return Failure;
         }
-        if (fileWrite.write(tmp) == -1 || !fileWrite.flush()) {
-            *errorMessage = msgWriteFailed(fileWrite, tmp.size());
+        if (fileWrite.write(m_buffer) == -1 || !fileWrite.flush()) {
+            *errorMessage = msgWriteFailed(fileWrite, m_buffer.size());
             return Failure;
         }
     }
-    if (diff) {
-        std::printf("%sFile: %s%s\n", colorInfo, qPrintable(name), colorReset);
-        ::diff(original.split('\n'), tmp.split('\n'));
+    if (m_diff) {
+        std::printf("%sFile: %s%s\n", colorInfo, qPrintable(m_name), colorReset);
+        ::diff(original.split('\n'), m_buffer.split('\n'));
         std::printf("\n");
     }
 
     return Success;
 }
-
-void FileOut::touchFile(const QString &filePath)
-{
-    QFile toucher(filePath);
-    qint64 size = toucher.size();
-    if (!toucher.open(QIODevice::ReadWrite)) {
-        qCWarning(lcShiboken).noquote().nospace()
-                << QStringLiteral("Failed to touch file '%1'")
-                   .arg(QDir::toNativeSeparators(filePath));
-        return;
-    }
-    toucher.resize(size+1);
-    toucher.resize(size);
-    toucher.close();
-}
diff --git a/sources/shiboken6/ApiExtractor/fileout.h b/sources/shiboken6/ApiExtractor/fileout.h
index 23dac7b1a..233752227 100644
--- a/sources/shiboken6/ApiExtractor/fileout.h
+++ b/sources/shiboken6/ApiExtractor/fileout.h
@@ -29,17 +29,13 @@
 #ifndef FILEOUT_H
 #define FILEOUT_H
 
-#include <QtCore/QObject>
 #include "textstream.h"
 
 QT_FORWARD_DECLARE_CLASS(QFile)
 
-class FileOut : public QObject
+class FileOut
 {
-private:
-    QByteArray tmp;
-    QString name;
-
+    QByteArray m_buffer;
 public:
     Q_DISABLE_COPY(FileOut)
 
@@ -48,22 +44,24 @@ public:
     explicit FileOut(QString name);
     ~FileOut();
 
-    QString filePath() const { return name; }
+    QString filePath() const { return m_name; }
 
     State done();
     State done(QString *errorMessage);
 
-    void touch() { touchFile(name); }
-
-    static void touchFile(const QString &filePath);
-
     TextStream stream;
 
-    static bool dummy;
-    static bool diff;
+    static bool diff() { return m_diff; }
+    static void setDiff(bool diff) { m_diff = diff; }
+
+    static bool dryRun() { return m_dryRun; }
+    static void setDryRun(bool dryRun) { m_dryRun = dryRun; }
 
 private:
-    bool isDone;
+    QString m_name;
+    bool m_isDone;
+    static bool m_dryRun;
+    static bool m_diff;
 };
 
 #endif // FILEOUT_H
diff --git a/sources/shiboken6/generator/main.cpp b/sources/shiboken6/generator/main.cpp
index feb9cbc46..e13b71eb4 100644
--- a/sources/shiboken6/generator/main.cpp
+++ b/sources/shiboken6/generator/main.cpp
@@ -484,13 +484,13 @@ int shibokenMain(int argc, char *argv[])
     ait = args.options.find(diffOption());
     if (ait != args.options.end()) {
         args.options.erase(ait);
-        FileOut::diff = true;
+        FileOut::setDiff(true);
     }
 
     ait = args.options.find(dryrunOption());
     if (ait != args.options.end()) {
         args.options.erase(ait);
-        FileOut::dummy = true;
+        FileOut::setDryRun(true);
     }
 
     QString licenseComment;