Merge pull request #202 from Gormogon/master

Align Pointers

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() );
 }

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();

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 );
 

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 );
 }

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;

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;

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;
 }

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 )
     {

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;

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

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;

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;

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;
 };
 

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() {}
 
 

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;

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);

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;
 };
 

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;

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);
 

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 paintEvent(QPaintEvent* event);
-    void resizeEvent(QResizeEvent * event);
+    void resizeEvent(QResizeEvent* event);
 
 };
 

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;
 

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 paintEvent(QPaintEvent* event);
-    void mousePressEvent(QMouseEvent *event);
+    void mousePressEvent(QMouseEvent* event);
 };
 
 #endif // TIMEZONEWIDGET_H

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 );

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() )
     {

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;