Code refactoring #2 (#15263)

* Refactoring /deploy
* Refactoring /src #1
* Refactoring /src #2

Author: pixiuPL

src/custompage.cpp

@@ -31,25 +31,20 @@
 
 #include "custompage.h"
 
-CustomPage::CustomPage(WebPage* parent)
-    : QWebPage(parent)
-    , m_webPage(parent)
+CustomPage::CustomPage(WebPage* parent) : QWebPage(parent), m_webPage(parent)
 {
     m_userAgent = QWebPage::userAgentForUrl(QUrl());
     setForwardUnsupportedContent(true);
-
     connect(this, &QWebPage::consoleMessageReceived, this, &CustomPage::onConsoleMessageReceived);
 }
 
 bool CustomPage::extension(Extension extension, const ExtensionOption* option, ExtensionReturn* output)
 {
     Q_UNUSED(option);
-
     if (extension == ChooseMultipleFilesExtension) {
         static_cast<ChooseMultipleFilesExtensionReturn*>(output)->fileNames = m_uploadFiles;
         return true;
     }
-
     return false;
 }
 
@@ -61,7 +56,6 @@ void CustomPage::setCookieJar(CookieJar* cookieJar)
 bool CustomPage::shouldInterruptJavaScript()
 {
     m_webPage->javascriptInterrupt();
-
     if (m_webPage->m_shouldInterruptJs) {
         // reset our flag
         m_webPage->m_shouldInterruptJs = false;

src/custompage.h

@@ -29,25 +29,17 @@
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#pragma once
-
 #include <QWebPage>
-
 #include "phantom.h"
 #include "webpage.h"
 
-/**
-* @class CustomPage
-*/
 class CustomPage : public QWebPage
 {
     Q_OBJECT
 
-public:
-    CustomPage(WebPage* parent = Q_NULLPTR);
+public: CustomPage(WebPage* parent = Q_NULLPTR);
 
     bool extension(Extension extension, const ExtensionOption* option, ExtensionReturn* output) Q_DECL_OVERRIDE;
-
     void setCookieJar(CookieJar* cookieJar);
     void setUserAgent(QString userAgent);
     QString userAgent() const;

src/encoding.cpp

@@ -38,7 +38,6 @@ Encoding::Encoding()
     if (!codec) {
         codec = QTextCodec::codecForLocale();
     }
-
     m_codec = codec;
 }
 
@@ -64,7 +63,6 @@ QByteArray Encoding::encode(const QString& string) const
 
 QString Encoding::getName() const
 {
-    // TODO Is it safe to assume UTF-8 here?
     return QString::fromUtf8(getCodec()->name());
 }
 
@@ -81,8 +79,7 @@ void Encoding::setEncoding(const QString& encoding)
 
 const Encoding Encoding::UTF8 = Encoding("UTF-8");
 
-// private:
-QTextCodec* Encoding::getCodec() const
+private: QTextCodec* Encoding::getCodec() const
 {
     QTextCodec* codec = m_codec;
 

src/encoding.h

@@ -28,8 +28,6 @@
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#pragma once
-
 #include <QTextCodec>
 
 class Encoding
@@ -38,15 +36,11 @@ class Encoding
     Encoding();
     Encoding(const QString& encoding);
     ~Encoding();
-
     QString decode(const QByteArray& bytes) const;
     QByteArray encode(const QString& string) const;
-
     QString getName() const;
     void setEncoding(const QString& encoding);
-
     QTextCodec* getCodec() const;
-
     static const Encoding UTF8;
 
 private:

src/env.cpp

@@ -31,7 +31,6 @@
 #include <QString>
 #include <QVariantMap>
 #include <QProcessEnvironment>
-
 #include "env.h"
 
 static Env* env_instance = Q_NULLPTR;
@@ -41,7 +40,6 @@ Env* Env::instance()
     if (!env_instance) {
         env_instance = new Env();
     }
-
     return env_instance;
 }
 

src/env.h

@@ -27,8 +27,6 @@
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#pragma once
-
 #include <QObject>
 #include <QVariantMap>
 
@@ -43,6 +41,5 @@ class Env : public QObject
 
 private:
     Env();
-
     QVariantMap m_map;
 };

src/filesystem.cpp

@@ -34,7 +34,6 @@
 #include <QDateTime>
 #include <QFile>
 #include <QFileInfo>
-
 #include "filesystem.h"
 
 // File
@@ -234,8 +233,7 @@ bool File::setEncoding(const QString& encoding)
 
     // "Binary" mode doesn't use/need text codecs
     if (!m_fileStream) {
-        // TODO: Should we switch to "text" mode?
-        return false;
+       return false;
     }
 
     // Since there can be multiple names for the same codec (i.e., "utf8" and
@@ -270,21 +268,18 @@ QString File::getEncoding() const
     return encoding;
 }
 
-// private:
-
-bool File::_isUnbuffered() const
+private bool File::_isUnbuffered() const
 {
     return m_file->openMode() & QIODevice::Unbuffered;
 }
 
 
 // FileSystem
-// public:
-FileSystem::FileSystem(QObject* parent)
+public: FileSystem::FileSystem(QObject* parent)
     : QObject(parent)
 { }
 
-// public slots:
+public slots:
 
 // Attributes
 int FileSystem::_size(const QString& path) const

src/filesystem.h

@@ -27,8 +27,6 @@
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#pragma once
-
 #include <QStringList>
 #include <QFile>
 #include <QTextCodec>
@@ -54,22 +52,17 @@ public Q_SLOTS:
     QString read(const QVariant& n = -1);
     bool write(const QString& data);
     bool isTTY();
-
     bool seek(const qint64 pos);
-
     QString readLine();
     bool writeLine(const QString& data);
-
     bool atEnd() const;
     void flush();
     void close();
-
     QString getEncoding() const;
     bool setEncoding(const QString& encoding);
 
 private:
     bool _isUnbuffered() const;
-
     QFile* m_file;
     QTextStream* m_fileStream;
 };