Skip to content
Snippets Groups Projects
Commit cf8fea2d authored by akiraohgaki's avatar akiraohgaki
Browse files

Update qtlibs

parent 5e9572b2
Branches
Tags
No related merge requests found
......@@ -21,15 +21,14 @@ Config::Config(const QString &configDirPath, QObject *parent)
: QObject(parent), configDirPath_(configDirPath)
{}
Config::Config(const Config &other)
Config::Config(const Config &other, QObject *parent)
: QObject(parent)
{
this->setParent(other.parent());
setConfigDirPath(other.configDirPath());
}
Config &Config::operator =(const Config &other)
{
this->setParent(other.parent());
setConfigDirPath(other.configDirPath());
return *this;
}
......
......@@ -23,7 +23,7 @@ class Config : public QObject
public:
explicit Config(const QString &configDirPath = QString(), QObject *parent = 0);
Config(const Config &other);
Config(const Config &other, QObject *parent = 0);
Config &operator =(const Config &other);
QString configDirPath() const;
......
......@@ -22,15 +22,14 @@ Dir::Dir(const QString &path, QObject *parent)
: QObject(parent), path_(path)
{}
Dir::Dir(const Dir &other)
Dir::Dir(const Dir &other, QObject *parent)
: QObject(parent)
{
this->setParent(other.parent());
setPath(other.path());
}
Dir &Dir::operator =(const Dir &other)
{
this->setParent(other.parent());
setPath(other.path());
return *this;
}
......
......@@ -23,7 +23,7 @@ class Dir : public QObject
public:
explicit Dir(const QString &path = QString(), QObject *parent = 0);
Dir(const Dir &other);
Dir(const Dir &other, QObject *parent = 0);
Dir &operator =(const Dir &other);
QString path() const;
......
......@@ -21,15 +21,14 @@ File::File(const QString &path, QObject *parent)
: QObject(parent), path_(path)
{}
File::File(const File &other)
File::File(const File &other, QObject *parent)
: QObject(parent)
{
this->setParent(other.parent());
setPath(other.path());
}
File &File::operator =(const File &other)
{
this->setParent(other.parent());
setPath(other.path());
return *this;
}
......
......@@ -22,7 +22,7 @@ class File : public QObject
public:
explicit File(const QString &path = QString(), QObject *parent = 0);
File(const File &other);
File(const File &other, QObject *parent = 0);
File &operator =(const File &other);
QString path() const;
......
......@@ -32,15 +32,14 @@ Json::Json(const QJsonArray &array, QObject *parent)
fromArray(array);
}
Json::Json(const Json &other)
Json::Json(const Json &other, QObject *parent)
: QObject(parent)
{
this->setParent(other.parent());
setJson(other.json());
}
Json &Json::operator =(const Json &other)
{
this->setParent(other.parent());
setJson(other.json());
return *this;
}
......
......@@ -26,7 +26,7 @@ public:
explicit Json(const QJsonObject &object, QObject *parent = 0);
explicit Json(const QJsonArray &array, QObject *parent = 0);
Json(const Json &other);
Json(const Json &other, QObject *parent = 0);
Json &operator =(const Json &other);
QByteArray json() const;
......
......@@ -28,30 +28,22 @@ NetworkResource::~NetworkResource()
manager()->deleteLater();
}
NetworkResource::NetworkResource(const NetworkResource &other)
NetworkResource::NetworkResource(const NetworkResource &other, QObject *parent)
: QObject(parent)
{
this->setParent(other.parent());
setName(other.name());
setUrl(other.url());
setAsync(other.async());
setRequest(other.request());
setManager(other.manager());
setReply(other.reply());
setMethod(other.method());
setManager(new QNetworkAccessManager(this));
}
NetworkResource &NetworkResource::operator =(const NetworkResource &other)
{
manager()->deleteLater();
this->setParent(other.parent());
setName(other.name());
setUrl(other.url());
setAsync(other.async());
setRequest(other.request());
setManager(other.manager());
setReply(other.reply());
setMethod(other.method());
return *this;
}
......
......@@ -27,7 +27,7 @@ public:
explicit NetworkResource(const QString &name = QString(), const QUrl &url = QUrl(), const bool &async = true, QObject *parent = 0);
~NetworkResource();
NetworkResource(const NetworkResource &other);
NetworkResource(const NetworkResource &other, QObject *parent = 0);
NetworkResource &operator =(const NetworkResource &other);
QString name() const;
......
......@@ -27,15 +27,14 @@ Package::Package(const QString &path, QObject *parent)
: QObject(parent), path_(path)
{}
Package::Package(const Package &other)
Package::Package(const Package &other, QObject *parent)
: QObject(parent)
{
this->setParent(other.parent());
setPath(other.path());
}
Package &Package::operator =(const Package &other)
{
this->setParent(other.parent());
setPath(other.path());
return *this;
}
......
......@@ -22,7 +22,7 @@ class Package : public QObject
public:
explicit Package(const QString &path = QString(), QObject *parent = 0);
Package(const Package &other);
Package(const Package &other, QObject *parent = 0);
Package &operator =(const Package &other);
QString path() const;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment