0021-Qt-Replace-remaining-NULLs-with-nullptr-in-headers.patch - Freeciv - Freeciv Ticket System

+    {
       Q_OBJECT
     public:
       explicit text_browser_dblclck(QWidget *parent = NULL): QTextBrowser(parent) {}
       explicit text_browser_dblclck(QWidget *parent = nullptr): QTextBrowser(parent) {}
     signals:
       void dbl_clicked();
     protected:

+    {
       Q_OBJECT
     public:
       explicit fc_tooltip(QObject *parent = NULL): QObject(parent) {}
       explicit fc_tooltip(QObject *parent = nullptr): QObject(parent) {}
     protected:
       bool eventFilter(QObject *obj, QEvent *event);
-...
     public:
       city_production_model(struct city *pcity, bool f, bool su, bool sw, bool sb,
                             QObject *parent = 0);
                             QObject *parent = nullptr);
       ~city_production_model();
       inline int rowCount(const QModelIndex &index = QModelIndex()) const {
         Q_UNUSED(index);
-...
       Q_OBJECT
     public:
       city_label(int type, QWidget *parent = 0);
       city_label(int type, QWidget *parent = nullptr);
       void set_city(struct city *pcity);
     private:
-...
       QSlider *slider_tab[2 * O_LAST + 2];
     public:
       city_dialog(QWidget *parent = 0);
       city_dialog(QWidget *parent = nullptr);
       ~city_dialog();
       void setup_ui(struct city *qcity);
       void refresh();

       void switch_target();
     public:
       choice_dialog(const QString title, const QString text,
                     QWidget *parent = NULL,
                     void (*run_on_close_in)(int) = NULL);
                     QWidget *parent = nullptr,
                     void (*run_on_close_in)(int) = nullptr);
       ~choice_dialog();
       void set_layout();
       void add_item(QString title, pfcn_void func, QVariant data1,

     class QSlider;
     /**************************************************************************
      * Custom slider with two settable values
      *************************************************************************/
       Custom slider with two settable values
     **************************************************************************/
     class fc_double_edge : public QWidget
+    {
       Q_OBJECT
-...
       int max_rates;
       QPixmap cursor_pix;
     public:
       fc_double_edge(QWidget *parent = NULL);
       fc_double_edge(QWidget *parent = nullptr);
       ~fc_double_edge();
       int current_min;
       int current_max;
-...
     };
     /**************************************************************************
      * Dialog used to change tax rates
      *************************************************************************/
       Dialog used to change tax rates
     **************************************************************************/
     class tax_rates_dialog: public qfc_dialog
+    {
     Q_OBJECT
       public:
       tax_rates_dialog(QWidget *parent = 0);
       tax_rates_dialog(QWidget *parent = nullptr);
     private:
       fc_double_edge *fcde;
-...
     };
     /**************************************************************************
      * Dialog used to change policies
      *************************************************************************/
       Dialog used to change policies
     **************************************************************************/
     class multipler_rates_dialog: public QDialog
+    {
       Q_OBJECT
     public:
       explicit multipler_rates_dialog(QWidget* parent = 0);
       explicit multipler_rates_dialog(QWidget *parent = nullptr);
     private:
       QList<QSlider*> slider_list;
       QPushButton *cancel_button;

+    {
       Q_OBJECT
     public:
       explicit pregamevote(QWidget *parent = NULL);
       explicit pregamevote(QWidget *parent = nullptr);
       ~pregamevote();
       void update_vote();
       QLabel *label_text;

Project

General

Profile

Freeciv

Feature #24 » 0021-Qt-Replace-remaining-NULLs-with-nullptr-in-headers.patch