diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp
index 7f8dde06815b334af430f12d99f6d101f45ab72c..f9a4c2719ccb6fa28353a9c06bd70ba610f17297 100644
--- a/src/calamares/CalamaresApplication.cpp
+++ b/src/calamares/CalamaresApplication.cpp
@@ -37,7 +37,7 @@
#include <QFileInfo>
-CalamaresApplication::CalamaresApplication( int& argc, char *argv[] )
+CalamaresApplication::CalamaresApplication( int& argc, char* argv[] )
: QApplication( argc, argv )
, m_mainwindow( 0 )
{
@@ -380,6 +380,6 @@ CalamaresApplication::onPluginsReady()
void
CalamaresApplication::initJobQueue()
{
- Calamares::JobQueue *jobQueue = new Calamares::JobQueue( this );
+ Calamares::JobQueue* jobQueue = new Calamares::JobQueue( this );
Calamares::Branding::instance()->setGlobals( jobQueue->globalStorage() );
}
diff --git a/src/calamares/CalamaresApplication.h b/src/calamares/CalamaresApplication.h
index 385954b2e7bb5829d320e17809a006c0142ba622..cc1f4f6efa36815dda5c9504ec6b466ba9ef9e83 100644
--- a/src/calamares/CalamaresApplication.h
+++ b/src/calamares/CalamaresApplication.h
@@ -36,7 +36,7 @@ class CalamaresApplication : public QApplication
{
Q_OBJECT
public:
- CalamaresApplication( int& argc, char *argv[] );
+ CalamaresApplication( int& argc, char* argv[] );
virtual ~CalamaresApplication();
void init();
diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp
index 2482e9214e36d79998c364f278416c8d82e2024b..bc27688f33ad7d861474e7077ffa1a0b4a81ed13 100644
--- a/src/calamares/main.cpp
+++ b/src/calamares/main.cpp
@@ -28,7 +28,7 @@
#include <QDir>
int
-main( int argc, char *argv[] )
+main( int argc, char* argv[] )
{
CalamaresApplication a( argc, argv );
diff --git a/src/calamares/progresstree/ProgressTreeModel.cpp b/src/calamares/progresstree/ProgressTreeModel.cpp
index d918da4fcddcd89b65368f9a526b69735df80811..8a42a25a31e0e54a81d5ec2c63b35da324fba9c0 100644
--- a/src/calamares/progresstree/ProgressTreeModel.cpp
+++ b/src/calamares/progresstree/ProgressTreeModel.cpp
@@ -88,7 +88,7 @@ ProgressTreeModel::data( const QModelIndex& index, int role ) const
if ( !index.isValid() )
return QVariant();
- ProgressTreeItem *item = static_cast< ProgressTreeItem* >( index.internalPointer() );
+ ProgressTreeItem* item = static_cast< ProgressTreeItem* >( index.internalPointer() );
return item->data( role );
}
diff --git a/src/calamares/progresstree/ProgressTreeModel.h b/src/calamares/progresstree/ProgressTreeModel.h
index e372422203a5fd0cc27cf3e479cd48fb7b0a71e3..39ec64a3eb93390a63777be8318994e443f4fd99 100644
--- a/src/calamares/progresstree/ProgressTreeModel.h
+++ b/src/calamares/progresstree/ProgressTreeModel.h
@@ -39,7 +39,7 @@ public:
// Reimplemented from QAbstractItemModel
Qt::ItemFlags flags( const QModelIndex& index ) const override;
- QModelIndex index( int row, int column, const QModelIndex &parent = QModelIndex() ) const override;
+ QModelIndex index( int row, int column, const QModelIndex& parent = QModelIndex() ) const override;
QModelIndex parent( const QModelIndex& index ) const override;
QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const override;
QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
diff --git a/src/libcalamares/PythonHelper.cpp b/src/libcalamares/PythonHelper.cpp
index a4bccf18a7baf7e46a1c217012820b1dead74194..53a34a9fcb98e0e24ad67bf5064b3d46c549c35b 100644
--- a/src/libcalamares/PythonHelper.cpp
+++ b/src/libcalamares/PythonHelper.cpp
@@ -218,7 +218,7 @@ Helper::createCleanNamespace()
QString
Helper::handleLastError()
{
- PyObject *type = nullptr, *val = nullptr, *tb = nullptr;
+ PyObject* type = nullptr, *val = nullptr, *tb = nullptr;
PyErr_Fetch( &type, &val, &tb );
QString typeMsg;
diff --git a/src/libcalamares/utils/CalamaresUtils.cpp b/src/libcalamares/utils/CalamaresUtils.cpp
index 66450945b30454f93319507cf94c6cde8aa13716..c3afc59f48bbde3cad5882f43d43dcacec0dcb73 100644
--- a/src/libcalamares/utils/CalamaresUtils.cpp
+++ b/src/libcalamares/utils/CalamaresUtils.cpp
@@ -186,7 +186,7 @@ installTranslator( const QString& localeName, QObject* parent )
void
-setQmlModulesDir( const QDir &dir )
+setQmlModulesDir( const QDir& dir )
{
s_qmlModulesDir = dir;
}
diff --git a/src/libcalamares/utils/Logger.cpp b/src/libcalamares/utils/Logger.cpp
index b0ac731c11d1eef1b73a6f6ad3e783d99ceed71a..265838428aa4afb890de90ef23deb85d88f701c0 100644
--- a/src/libcalamares/utils/Logger.cpp
+++ b/src/libcalamares/utils/Logger.cpp
@@ -46,7 +46,7 @@ namespace Logger
{
static void
-log( const char *msg, unsigned int debugLevel, bool toDisk = true )
+log( const char* msg, unsigned int debugLevel, bool toDisk = true )
{
if ( s_threshold < 0 )
{
diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h
index 87b8366464495eb4629a64286cc5a0f0f063fafe..bddea1b7041335fda7ae9f097c971574f19269c6 100644
--- a/src/libcalamaresui/Branding.h
+++ b/src/libcalamaresui/Branding.h
@@ -56,7 +56,7 @@ public:
static Branding* instance();
explicit Branding( const QString& brandingFilePath,
- QObject *parent = nullptr );
+ QObject* parent = nullptr );
QString descriptorPath() const;
QString componentName() const;
diff --git a/src/libcalamaresui/Settings.h b/src/libcalamaresui/Settings.h
index 5b3757adab3c2599d834b99c991b7cf389167769..fbe060cd8a2ecd489ec9dcf92ffb3555ac3203e9 100644
--- a/src/libcalamaresui/Settings.h
+++ b/src/libcalamaresui/Settings.h
@@ -35,7 +35,7 @@ class UIDLLEXPORT Settings : public QObject
public:
explicit Settings( const QString& settingsFilePath,
bool debugMode,
- QObject *parent = nullptr );
+ QObject* parent = nullptr );
static Settings* instance();
//TODO: load from JSON then emit ready
diff --git a/src/libcalamaresui/modulesystem/ProcessJobModule.h b/src/libcalamaresui/modulesystem/ProcessJobModule.h
index 692fceb614819f7ef5f17d6ffcfeae241747611f..7ec3f8c6445a64f9e5b56e4e64f29b46c0ae202a 100644
--- a/src/libcalamaresui/modulesystem/ProcessJobModule.h
+++ b/src/libcalamaresui/modulesystem/ProcessJobModule.h
@@ -35,7 +35,7 @@ public:
QList< job_ptr > jobs() const override;
protected:
- void initFrom( const YAML::Node &node ) override;
+ void initFrom( const YAML::Node& node ) override;
private:
friend class Module;
diff --git a/src/libcalamaresui/modulesystem/PythonJobModule.h b/src/libcalamaresui/modulesystem/PythonJobModule.h
index b8721f5651576f1f86f638e7cb4c59d73a9afbb4..f5a4b09b34efdd09fdd84eae70c6afde4a3086cb 100644
--- a/src/libcalamaresui/modulesystem/PythonJobModule.h
+++ b/src/libcalamaresui/modulesystem/PythonJobModule.h
@@ -35,7 +35,7 @@ public:
QList< job_ptr > jobs() const override;
protected:
- void initFrom( const YAML::Node &node ) override;
+ void initFrom( const YAML::Node& node ) override;
private:
friend class Module;
diff --git a/src/libcalamaresui/modulesystem/ViewModule.h b/src/libcalamaresui/modulesystem/ViewModule.h
index 3563ac96d041baf982bdc6e3b99bf650ca52dcbc..3eb161440580beae504251d82016243b265a1809 100644
--- a/src/libcalamaresui/modulesystem/ViewModule.h
+++ b/src/libcalamaresui/modulesystem/ViewModule.h
@@ -38,14 +38,14 @@ public:
QList< job_ptr > jobs() const override;
protected:
- void initFrom( const YAML::Node &node ) override;
+ void initFrom( const YAML::Node& node ) override;
private:
friend class Module; //so only the superclass can instantiate
explicit ViewModule();
virtual ~ViewModule();
- QPluginLoader *m_loader;
+ QPluginLoader* m_loader;
ViewStep* m_viewStep = nullptr;
};
diff --git a/src/libcalamaresui/viewpages/AbstractPage.h b/src/libcalamaresui/viewpages/AbstractPage.h
index 8902a1785657d2c937a256a96a2d168ca584de8b..61a1ee2a09874fcab39ad8b9860cd7257d5e4889 100644
--- a/src/libcalamaresui/viewpages/AbstractPage.h
+++ b/src/libcalamaresui/viewpages/AbstractPage.h
@@ -30,7 +30,7 @@ class UIDLLEXPORT AbstractPage : public QWidget
{
Q_OBJECT
public:
- explicit AbstractPage(QWidget *parent = nullptr);
+ explicit AbstractPage(QWidget* parent = nullptr);
virtual ~AbstractPage() {}
diff --git a/src/libcalamaresui/viewpages/ViewStep.h b/src/libcalamaresui/viewpages/ViewStep.h
index be29aa65ff7ce61ccc2f0d9d4ca91c6d11c416e1..1de6d037c059bac6706571af3f0e9e8e09b75510 100644
--- a/src/libcalamaresui/viewpages/ViewStep.h
+++ b/src/libcalamaresui/viewpages/ViewStep.h
@@ -31,7 +31,7 @@ class UIDLLEXPORT ViewStep : public QObject
{
Q_OBJECT
public:
- explicit ViewStep( QObject *parent = nullptr );
+ explicit ViewStep( QObject* parent = nullptr );
virtual ~ViewStep();
virtual QString prettyName() const = 0;
diff --git a/src/libcalamaresui/widgets/QtWaitingSpinner.cpp b/src/libcalamaresui/widgets/QtWaitingSpinner.cpp
index 834c91c1fad6869528c47cd52da3fb31e71fa010..c298a61ec37e5630b8bcdb180b9c4921499795ca 100644
--- a/src/libcalamaresui/widgets/QtWaitingSpinner.cpp
+++ b/src/libcalamaresui/widgets/QtWaitingSpinner.cpp
@@ -26,7 +26,7 @@
#include "QtWaitingSpinner.h"
-QtWaitingSpinner::QtWaitingSpinner(int linesNumber, int length, int width, int radius, QWidget *parent) : QWidget(parent),
+QtWaitingSpinner::QtWaitingSpinner(int linesNumber, int length, int width, int radius, QWidget* parent) : QWidget(parent),
myLinesNumber(linesNumber),
myLength(length + width),
myWidth(width),
@@ -45,7 +45,7 @@ QtWaitingSpinner::QtWaitingSpinner(int linesNumber, int length, int width, int r
this->hide();
}
-void QtWaitingSpinner::paintEvent(QPaintEvent */*ev*/) {
+void QtWaitingSpinner::paintEvent(QPaintEvent* /*ev*/) {
QPainter painter(this);
painter.fillRect(this->rect(), Qt::transparent);
painter.setRenderHint(QPainter::Antialiasing, true);
diff --git a/src/libcalamaresui/widgets/QtWaitingSpinner.h b/src/libcalamaresui/widgets/QtWaitingSpinner.h
index 77a7f6b684bd74d7d93622a2fa78c0392f563857..b01ebd1a83ffc4719994b5ea561c453eeecbbc3b 100644
--- a/src/libcalamaresui/widgets/QtWaitingSpinner.h
+++ b/src/libcalamaresui/widgets/QtWaitingSpinner.h
@@ -33,7 +33,7 @@ class UIDLLEXPORT QtWaitingSpinner : public QWidget {
Q_OBJECT
public:
- explicit QtWaitingSpinner(int linesNumber = 12, int length = 7, int width = 5, int radius = 10, QWidget *parent = 0);
+ explicit QtWaitingSpinner(int linesNumber = 12, int length = 7, int width = 5, int radius = 10, QWidget* parent = 0);
public Q_SLOTS:
void start();
@@ -56,7 +56,7 @@ private Q_SLOTS:
void updateTimer();
protected:
- void paintEvent(QPaintEvent *ev);
+ void paintEvent(QPaintEvent* ev);
private:
static int countTimeout(int lines, qreal speed);
@@ -75,7 +75,7 @@ private:
int myOpacity;
private:
- QTimer *myTimer;
+ QTimer* myTimer;
int myCurrentCounter;
};
diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h
index 0f12c3e638c10cb358267c365347de1c17e6df34..bcb820ea3050d5d0855000a53c707f1e78f76957 100644
--- a/src/modules/keyboard/KeyboardPage.h
+++ b/src/modules/keyboard/KeyboardPage.h
@@ -70,7 +70,7 @@ private:
void updateVariants( LayoutItem* currentItem, QString currentVariant = QString() );
- Ui::Page_Keyboard *ui;
+ Ui::Page_Keyboard* ui;
KeyBoardPreview* m_keyboardPreview;
int m_defaultIndex;
QMap< QString, QString > m_models;
diff --git a/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp b/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
index e226581945cea6add1d1083b3c1299a62311d692..72d6c0616242ba941d6e4d837bb467181609caae 100644
--- a/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
+++ b/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
@@ -22,7 +22,7 @@
#include "keyboardpreview.h"
-KeyBoardPreview::KeyBoardPreview(QWidget *parent) :
+KeyBoardPreview::KeyBoardPreview(QWidget* parent) :
QWidget(parent)
{
setMinimumSize(700, 191);
@@ -206,7 +206,7 @@ void KeyBoardPreview::resizeEvent(QResizeEvent *) {
-void KeyBoardPreview::paintEvent(QPaintEvent * event) {
+void KeyBoardPreview::paintEvent(QPaintEvent* event) {
QPainter p(this);
p.setRenderHint(QPainter::Antialiasing);
diff --git a/src/modules/keyboard/keyboardwidget/keyboardpreview.h b/src/modules/keyboard/keyboardwidget/keyboardpreview.h
index 0a760ae7bee1c822ad414fe9c806bec0f9664f72..02714c2ad13b788bd07da7b528085b8e3a461250 100644
--- a/src/modules/keyboard/keyboardwidget/keyboardpreview.h
+++ b/src/modules/keyboard/keyboardwidget/keyboardpreview.h
@@ -40,7 +40,7 @@ class KeyBoardPreview : public QWidget
{
Q_OBJECT
public:
- explicit KeyBoardPreview(QWidget *parent = 0);
+ explicit KeyBoardPreview(QWidget* parent = 0);
void setLayout(QString layout);
void setVariant(QString variant);
@@ -59,7 +59,7 @@ private:
QString layout, variant;
QFont lowerFont, upperFont;
- KB *kb, kbList[3];
+ KB* kb, kbList[3];
QList<Code> codes;
int space, usable_width, key_w;
@@ -72,8 +72,8 @@ private:
QString fromUnicodeString(QString raw);
protected:
- void paintEvent(QPaintEvent * event);
- void resizeEvent(QResizeEvent * event);
+ void paintEvent(QPaintEvent* event);
+ void resizeEvent(QResizeEvent* event);
};
diff --git a/src/modules/locale/timezonewidget/timezonewidget.cpp b/src/modules/locale/timezonewidget/timezonewidget.cpp
index af4ac1a171f65ee54816b2a01086e02bbe0f42d0..b8713e1070ca83f928ea9c41fa5b0620861c18e8 100644
--- a/src/modules/locale/timezonewidget/timezonewidget.cpp
+++ b/src/modules/locale/timezonewidget/timezonewidget.cpp
@@ -22,7 +22,7 @@
#include "timezonewidget.h"
-TimeZoneWidget::TimeZoneWidget(QWidget *parent) :
+TimeZoneWidget::TimeZoneWidget(QWidget* parent) :
QWidget(parent)
{
setMouseTracking(false);
@@ -157,7 +157,7 @@ void TimeZoneWidget::paintEvent(QPaintEvent*) {
-void TimeZoneWidget::mousePressEvent(QMouseEvent *event) {
+void TimeZoneWidget::mousePressEvent(QMouseEvent* event) {
if (event->button() != Qt::LeftButton)
return;
diff --git a/src/modules/locale/timezonewidget/timezonewidget.h b/src/modules/locale/timezonewidget/timezonewidget.h
index 86b0b08724bb92b17caf967d30bb5900e8188871..27256fabe574cf506686fc233525e1533ab12a06 100644
--- a/src/modules/locale/timezonewidget/timezonewidget.h
+++ b/src/modules/locale/timezonewidget/timezonewidget.h
@@ -48,7 +48,7 @@ class TimeZoneWidget : public QWidget
{
Q_OBJECT
public:
- explicit TimeZoneWidget(QWidget *parent = 0);
+ explicit TimeZoneWidget(QWidget* parent = 0);
LocaleGlobal::Location getCurrentLocation() { return currentLocation; }
void setCurrentLocation(QString region, QString zone);
@@ -65,8 +65,8 @@ private:
QPoint getLocationPosition(double longitude, double latitude);
- void paintEvent(QPaintEvent *event);
- void mousePressEvent(QMouseEvent *event);
+ void paintEvent(QPaintEvent* event);
+ void mousePressEvent(QMouseEvent* event);
};
#endif // TIMEZONEWIDGET_H
diff --git a/src/modules/prepare/PreparePage.cpp b/src/modules/prepare/PreparePage.cpp
index 00a5ccab98cdefbcd5b12cdbe56fff014716bc20..3d1d646085a8c7c8d336e7f0606d8db183b05303 100644
--- a/src/modules/prepare/PreparePage.cpp
+++ b/src/modules/prepare/PreparePage.cpp
@@ -31,7 +31,7 @@
PreparePage::PreparePage( QWidget* parent )
: QWidget()
{
- QBoxLayout *mainLayout = new QVBoxLayout;
+ QBoxLayout* mainLayout = new QVBoxLayout;
setLayout( mainLayout );
QLabel* text = new QLabel( this );
diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp
index 6df4b46dea162ca79dfbd54fc4c4726440970bf3..784c37458dcc9729224e2edd5ebe71bcd5108fd3 100644
--- a/src/modules/users/UsersPage.cpp
+++ b/src/modules/users/UsersPage.cpp
@@ -135,7 +135,7 @@ UsersPage::onActivate()
void
-UsersPage::onFullNameTextEdited( const QString &textRef )
+UsersPage::onFullNameTextEdited( const QString& textRef )
{
if ( textRef.isEmpty() )
{
diff --git a/src/modules/users/UsersViewStep.h b/src/modules/users/UsersViewStep.h
index e59d2d09bbaaf2b25137f25b399f9152181f6d2a..e5d6178768491252e6e9ac0234f1f04f0c54970b 100644
--- a/src/modules/users/UsersViewStep.h
+++ b/src/modules/users/UsersViewStep.h
@@ -57,7 +57,7 @@ public:
void onActivate() override;
void onLeave() override;
- void setConfigurationMap( const QVariantMap &configurationMap ) override;
+ void setConfigurationMap( const QVariantMap& configurationMap ) override;
private:
UsersPage* m_widget;