From e2d05cb9f2dbaad22de0631b25bea68599c3e1c8 Mon Sep 17 00:00:00 2001
From: Gormogon <amorphous.serendipity@gmail.com>
Date: Wed, 25 Feb 2015 19:57:19 -0500
Subject: [PATCH] Align Pointers
---
src/calamares/CalamaresApplication.cpp | 4 ++--
src/calamares/CalamaresApplication.h | 2 +-
src/calamares/main.cpp | 2 +-
src/calamares/progresstree/ProgressTreeModel.cpp | 2 +-
src/calamares/progresstree/ProgressTreeModel.h | 2 +-
src/libcalamares/PythonHelper.cpp | 2 +-
src/libcalamares/utils/CalamaresUtils.cpp | 2 +-
src/libcalamares/utils/Logger.cpp | 2 +-
src/libcalamaresui/Branding.h | 2 +-
src/libcalamaresui/Settings.h | 2 +-
src/libcalamaresui/modulesystem/ProcessJobModule.h | 2 +-
src/libcalamaresui/modulesystem/PythonJobModule.h | 2 +-
src/libcalamaresui/modulesystem/ViewModule.h | 4 ++--
src/libcalamaresui/viewpages/AbstractPage.h | 2 +-
src/libcalamaresui/viewpages/ViewStep.h | 2 +-
src/libcalamaresui/widgets/QtWaitingSpinner.cpp | 4 ++--
src/libcalamaresui/widgets/QtWaitingSpinner.h | 6 +++---
src/modules/keyboard/KeyboardPage.h | 2 +-
src/modules/keyboard/keyboardwidget/keyboardpreview.cpp | 4 ++--
src/modules/keyboard/keyboardwidget/keyboardpreview.h | 8 ++++----
src/modules/locale/timezonewidget/timezonewidget.cpp | 4 ++--
src/modules/locale/timezonewidget/timezonewidget.h | 6 +++---
src/modules/prepare/PreparePage.cpp | 2 +-
src/modules/users/UsersPage.cpp | 2 +-
src/modules/users/UsersViewStep.h | 2 +-
25 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp
index 7f8dde0681..f9a4c2719c 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 385954b2e7..cc1f4f6efa 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 2482e9214e..bc27688f33 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 d918da4fcd..8a42a25a31 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 e372422203..39ec64a3eb 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 a4bccf18a7..53a34a9fcb 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 66450945b3..c3afc59f48 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 b0ac731c11..265838428a 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 87b8366464..bddea1b704 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 5b3757adab..fbe060cd8a 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 692fceb614..7ec3f8c644 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 b8721f5651..f5a4b09b34 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 3563ac96d0..3eb1614405 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 8902a17856..61a1ee2a09 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 be29aa65ff..1de6d037c0 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 834c91c1fa..c298a61ec3 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 77a7f6b684..b01ebd1a83 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 0f12c3e638..bcb820ea30 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 e226581945..72d6c06162 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 0a760ae7be..02714c2ad1 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 af4ac1a171..b8713e1070 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 86b0b08724..27256fabe5 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 00a5ccab98..3d1d646085 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 6df4b46dea..784c37458d 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 e59d2d09bb..e5d6178768 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;
--
GitLab