summary refs log tree commit diff
path: root/src/ui
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2020-02-04 04:58:43 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2020-02-04 04:58:43 +0100
commit7ccc120f6345bff8dad4abb349669973746aa8da (patch)
tree4922b19543b810cfa73fc9bf87d82d1341601870 /src/ui
parentImprove styling a bit (diff)
downloadnheko-7ccc120f6345bff8dad4abb349669973746aa8da.tar.xz
modernize: use nullptr
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/Avatar.h2
-rw-r--r--src/ui/Badge.h6
-rw-r--r--src/ui/FlatButton.h6
-rw-r--r--src/ui/LoadingIndicator.h2
-rw-r--r--src/ui/RaisedButton.h4
-rw-r--r--src/ui/Ripple.cpp2
-rw-r--r--src/ui/Ripple.h4
-rw-r--r--src/ui/RippleOverlay.h2
-rw-r--r--src/ui/TextField.cpp8
-rw-r--r--src/ui/TextField.h2
-rw-r--r--src/ui/Theme.h2
11 files changed, 20 insertions, 20 deletions
diff --git a/src/ui/Avatar.h b/src/ui/Avatar.h
index a643c8c4..d6d0b5c7 100644
--- a/src/ui/Avatar.h
+++ b/src/ui/Avatar.h
@@ -15,7 +15,7 @@ class Avatar : public QWidget
         Q_PROPERTY(QColor backgroundColor WRITE setBackgroundColor READ backgroundColor)
 
 public:
-        explicit Avatar(QWidget *parent = 0, int size = ui::AvatarSize);
+        explicit Avatar(QWidget *parent = nullptr, int size = ui::AvatarSize);
 
         void setBackgroundColor(const QColor &color);
         void setIcon(const QIcon &icon);
diff --git a/src/ui/Badge.h b/src/ui/Badge.h
index fd73ad30..748b56fd 100644
--- a/src/ui/Badge.h
+++ b/src/ui/Badge.h
@@ -16,9 +16,9 @@ class Badge : public OverlayWidget
         Q_PROPERTY(QPointF relativePosition WRITE setRelativePosition READ relativePosition)
 
 public:
-        explicit Badge(QWidget *parent = 0);
-        explicit Badge(const QIcon &icon, QWidget *parent = 0);
-        explicit Badge(const QString &text, QWidget *parent = 0);
+        explicit Badge(QWidget *parent = nullptr);
+        explicit Badge(const QIcon &icon, QWidget *parent = nullptr);
+        explicit Badge(const QString &text, QWidget *parent = nullptr);
 
         void setBackgroundColor(const QColor &color);
         void setTextColor(const QColor &color);
diff --git a/src/ui/FlatButton.h b/src/ui/FlatButton.h
index d29903c2..764df6e9 100644
--- a/src/ui/FlatButton.h
+++ b/src/ui/FlatButton.h
@@ -91,14 +91,14 @@ class FlatButton : public QPushButton
         Q_PROPERTY(qreal fontSize WRITE setFontSize READ fontSize)
 
 public:
-        explicit FlatButton(QWidget *parent         = 0,
+        explicit FlatButton(QWidget *parent         = nullptr,
                             ui::ButtonPreset preset = ui::ButtonPreset::FlatPreset);
         explicit FlatButton(const QString &text,
-                            QWidget *parent         = 0,
+                            QWidget *parent         = nullptr,
                             ui::ButtonPreset preset = ui::ButtonPreset::FlatPreset);
         FlatButton(const QString &text,
                    ui::Role role,
-                   QWidget *parent         = 0,
+                   QWidget *parent         = nullptr,
                    ui::ButtonPreset preset = ui::ButtonPreset::FlatPreset);
         ~FlatButton();
 
diff --git a/src/ui/LoadingIndicator.h b/src/ui/LoadingIndicator.h
index 1585098e..e72a8c48 100644
--- a/src/ui/LoadingIndicator.h
+++ b/src/ui/LoadingIndicator.h
@@ -12,7 +12,7 @@ class LoadingIndicator : public QWidget
         Q_PROPERTY(QColor color READ color WRITE setColor)
 
 public:
-        LoadingIndicator(QWidget *parent = 0);
+        LoadingIndicator(QWidget *parent = nullptr);
 
         void paintEvent(QPaintEvent *e);
 
diff --git a/src/ui/RaisedButton.h b/src/ui/RaisedButton.h
index edd5ee4a..74543262 100644
--- a/src/ui/RaisedButton.h
+++ b/src/ui/RaisedButton.h
@@ -11,8 +11,8 @@ class RaisedButton : public FlatButton
         Q_OBJECT
 
 public:
-        explicit RaisedButton(QWidget *parent = 0);
-        explicit RaisedButton(const QString &text, QWidget *parent = 0);
+        explicit RaisedButton(QWidget *parent = nullptr);
+        explicit RaisedButton(const QString &text, QWidget *parent = nullptr);
         ~RaisedButton();
 
 protected:
diff --git a/src/ui/Ripple.cpp b/src/ui/Ripple.cpp
index e22c4a62..ef8a62dd 100644
--- a/src/ui/Ripple.cpp
+++ b/src/ui/Ripple.cpp
@@ -3,7 +3,7 @@
 
 Ripple::Ripple(const QPoint &center, QObject *parent)
   : QParallelAnimationGroup(parent)
-  , overlay_(0)
+  , overlay_(nullptr)
   , radius_anim_(animate("radius"))
   , opacity_anim_(animate("opacity"))
   , radius_(0)
diff --git a/src/ui/Ripple.h b/src/ui/Ripple.h
index 9184f061..3701fb6c 100644
--- a/src/ui/Ripple.h
+++ b/src/ui/Ripple.h
@@ -16,8 +16,8 @@ class Ripple : public QParallelAnimationGroup
         Q_PROPERTY(qreal opacity WRITE setOpacity READ opacity)
 
 public:
-        explicit Ripple(const QPoint &center, QObject *parent = 0);
-        Ripple(const QPoint &center, RippleOverlay *overlay, QObject *parent = 0);
+        explicit Ripple(const QPoint &center, QObject *parent = nullptr);
+        Ripple(const QPoint &center, RippleOverlay *overlay, QObject *parent = nullptr);
 
         inline void setOverlay(RippleOverlay *overlay);
 
diff --git a/src/ui/RippleOverlay.h b/src/ui/RippleOverlay.h
index 9ef91fbf..5d12aff7 100644
--- a/src/ui/RippleOverlay.h
+++ b/src/ui/RippleOverlay.h
@@ -11,7 +11,7 @@ class RippleOverlay : public OverlayWidget
         Q_OBJECT
 
 public:
-        explicit RippleOverlay(QWidget *parent = 0);
+        explicit RippleOverlay(QWidget *parent = nullptr);
 
         void addRipple(Ripple *ripple);
         void addRipple(const QPoint &position, qreal radius = 300);
diff --git a/src/ui/TextField.cpp b/src/ui/TextField.cpp
index 0ae2516d..6c1552a8 100644
--- a/src/ui/TextField.cpp
+++ b/src/ui/TextField.cpp
@@ -16,7 +16,7 @@ TextField::TextField(QWidget *parent)
         QPalette pal;
 
         state_machine_    = new TextFieldStateMachine(this);
-        label_            = 0;
+        label_            = nullptr;
         label_font_size_  = 15;
         show_label_       = false;
         background_color_ = pal.color(QPalette::Window);
@@ -230,9 +230,9 @@ TextFieldStateMachine::TextFieldStateMachine(TextField *parent)
         normal_state_  = new QState;
         focused_state_ = new QState;
 
-        label_       = 0;
-        offset_anim_ = 0;
-        color_anim_  = 0;
+        label_       = nullptr;
+        offset_anim_ = nullptr;
+        color_anim_  = nullptr;
         progress_    = 0.0;
 
         addState(normal_state_);
diff --git a/src/ui/TextField.h b/src/ui/TextField.h
index 1675a2e0..100fed31 100644
--- a/src/ui/TextField.h
+++ b/src/ui/TextField.h
@@ -22,7 +22,7 @@ class TextField : public QLineEdit
         Q_PROPERTY(QColor backgroundColor WRITE setBackgroundColor READ backgroundColor)
 
 public:
-        explicit TextField(QWidget *parent = 0);
+        explicit TextField(QWidget *parent = nullptr);
 
         void setInkColor(const QColor &color);
         void setBackgroundColor(const QColor &color);
diff --git a/src/ui/Theme.h b/src/ui/Theme.h
index d1d7e2a6..ecff02b5 100644
--- a/src/ui/Theme.h
+++ b/src/ui/Theme.h
@@ -78,7 +78,7 @@ class Theme : public QObject
 {
         Q_OBJECT
 public:
-        explicit Theme(QObject *parent = 0);
+        explicit Theme(QObject *parent = nullptr);
 
         QColor getColor(const QString &key) const;