arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-14 06:15:49 +00:00
Code Issues Projects Releases Wiki Activity

some refactoring

Browse Source 
* massive changes inside includes, drop unused definitions
* rewrite some initialization methods to avoid additional
freeing/allocation
* drop some explicit destructors calls
This commit is contained in:
Evgenii Alekseev
2017-07-14 03:34:05 +03:00
parent e90e1da096
commit d2e6f2fe38
47 changed files with 79 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/awesomewidgets/abstractextitem.cpp
View File

@ -24,7 +24,6 @@
#include <QTime>
#include "abstractextitemaggregator.h"
#include "awdebug.h"
#include "qcronscheduler.h"
@ -47,7 +46,7 @@ AbstractExtItem::~AbstractExtItem()
if (m_socket) {
m_socket->close();
m_socket->removeServer(socket());
delete m_socket;
m_socket->deleteLater();
}
}

1
sources/awesomewidgets/abstractextitemaggregator.cpp
View File

@ -21,7 +21,6 @@
#include <KI18n/KLocalizedString>
#include <QDir>
#include <QFileInfo>
#include <QInputDialog>
#include <QPushButton>

1
sources/awesomewidgets/awdatetimeformatter.cpp
View File

@ -22,7 +22,6 @@
#include <KI18n/KLocalizedString>
#include <QDateTime>
#include <QDir>
#include <QSettings>
#include "awdebug.h"

3
sources/awesomewidgets/awdatetimeformatter.h
View File

@ -18,9 +18,10 @@
#ifndef AWDATETIMEFORMATTER_H
#define AWDATETIMEFORMATTER_H
#include "awabstractformatter.h"
#include <QLocale>
#include "awabstractformatter.h"
namespace Ui
{

1
sources/awesomewidgets/awfloatformatter.cpp
View File

@ -21,7 +21,6 @@
#include <KI18n/KLocalizedString>
#include <QDir>
#include <QSettings>
#include "awdebug.h"

1
sources/awesomewidgets/awscriptformatter.cpp
View File

@ -21,7 +21,6 @@
#include <KI18n/KLocalizedString>
#include <QDir>
#include <QJSEngine>
#include <QSettings>

1
sources/awesomewidgets/awstringformatter.cpp
View File

@ -21,7 +21,6 @@
#include <KI18n/KLocalizedString>
#include <QDir>
#include <QSettings>
#include "awdebug.h"

2
sources/awesomewidgets/extnetworkrequest.cpp
View File

@ -21,8 +21,6 @@
#include <KI18n/KLocalizedString>
#include <QDir>
#include <QNetworkAccessManager>
#include <QNetworkRequest>
#include <QSettings>
#include <QTextCodec>

3
sources/awesomewidgets/extquotes.cpp
View File

@ -22,9 +22,6 @@
#include <QDir>
#include <QJsonDocument>
#include <QJsonParseError>
#include <QNetworkAccessManager>
#include <QNetworkRequest>
#include <QSettings>
#include <QUrlQuery>

1
sources/awesomewidgets/extscript.cpp
View File

@ -22,7 +22,6 @@
#include <QDir>
#include <QJsonDocument>
#include <QJsonParseError>
#include <QSettings>
#include <QStandardPaths>
#include <QTextCodec>

1
sources/awesomewidgets/extupgrade.cpp
View File

@ -21,7 +21,6 @@
#include <KI18n/KLocalizedString>
#include <QDir>
#include <QRegExp>
#include <QSettings>
#include <QTextCodec>

4
sources/awesomewidgets/extweather.cpp
View File

@ -22,9 +22,6 @@
#include <QDir>
#include <QJsonDocument>
#include <QJsonParseError>
#include <QNetworkAccessManager>
#include <QNetworkRequest>
#include <QSettings>
#include <QStandardPaths>
@ -72,7 +69,6 @@ ExtWeather::~ExtWeather()
disconnect(this, SIGNAL(requestDataUpdate()), this, SLOT(sendRequest()));
m_manager->deleteLater();
delete m_providerObject;
delete ui;
}

32
sources/awesomewidgets/graphicalitem.cpp
View File

@ -38,6 +38,19 @@ GraphicalItem::GraphicalItem(QWidget *_parent, const QString &_filePath)
{
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
// init scene
m_scene = new QGraphicsScene();
m_scene->setBackgroundBrush(QBrush(Qt::NoBrush));
// init view
m_view = new QGraphicsView(m_scene);
m_view->setStyleSheet("background: transparent");
m_view->setContentsMargins(0, 0, 0, 0);
m_view->setFrameShape(QFrame::NoFrame);
m_view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
m_view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
// init helper
m_helper = new GraphicalItemHelper(this, m_scene);
if (!_filePath.isEmpty())
readConfiguration();
ui->setupUi(this);
@ -58,9 +71,7 @@ GraphicalItem::~GraphicalItem()
{
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
delete m_scene;
delete ui;
delete m_helper;
}
@ -141,24 +152,7 @@ QString GraphicalItem::image(const QVariant &value)
void GraphicalItem::initScene()
{
// cleanup
delete m_helper;
delete m_scene;
// init scene
m_scene = new QGraphicsScene();
m_scene->setBackgroundBrush(QBrush(Qt::NoBrush));
// init view
m_view = new QGraphicsView(m_scene);
m_view->setStyleSheet("background: transparent");
m_view->setContentsMargins(0, 0, 0, 0);
m_view->setFrameShape(QFrame::NoFrame);
m_view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
m_view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
m_view->resize(m_width + 5, m_height + 5);
// init helper
m_helper = new GraphicalItemHelper(this, m_scene);
m_helper->setParameters(activeColor(), inactiveColor(), itemWidth(),
itemHeight(), count());
}

1
sources/awesomewidgets/graphicalitemhelper.cpp
View File

@ -17,7 +17,6 @@
#include "graphicalitemhelper.h"
#include <QColor>
#include <QGraphicsEllipseItem>
#include <QGraphicsScene>
#include <QUrl>

1
sources/awesomewidgets/qcronscheduler.cpp
View File

@ -44,7 +44,6 @@ QCronScheduler::~QCronScheduler()
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
m_timer->stop();
delete m_timer;
}