← Back to branch summary

~georg-zotti/stellarium/gz_AtmosphereTweaks

« back to all changes in this revision

Viewing changes to plugins/RemoteControl/src/RemoteControl.cpp

  • Committer: Georg Zotti
  • Date: 2017-05-23 13:18:09 UTC
  • mfrom: (8115.1.1321 trunk)
  • Revision ID: georg.zotti@univie.ac.at-20170523131809-a6pus0ogpmjwtmd8
merge-in trunk r9436

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/RemoteControl/src/RemoteControl.cpp
64
64
}
65
65
 
66
66
RemoteControl::RemoteControl()
67
 
        : httpListener(NULL)
68
 
        , requestHandler(NULL)
 
67
        : httpListener(Q_NULLPTR)
 
68
        , requestHandler(Q_NULLPTR)
69
69
        , enabled(false)
70
70
        , autoStart(false)
71
71
        , usePassword(false)
73
73
        , port(8090)
74
74
        , minThreads(1)
75
75
        , maxThreads(30)
76
 
        , toolbarButton(NULL)
 
76
        , toolbarButton(Q_NULLPTR)
77
77
{
78
78
        setObjectName("RemoteControl");
79
79
 
151
151
        try
152
152
        {
153
153
                StelGui* gui = dynamic_cast<StelGui*>(app.getGui());
154
 
                if (gui!=NULL)
 
154
                if (gui!=Q_NULLPTR)
155
155
                {
156
 
                        toolbarButton = new StelButton(NULL,
 
156
                        toolbarButton = new StelButton(Q_NULLPTR,
157
157
                                                       QPixmap(":/RemoteControl/resources/bt_remote_on.png"),
158
158
                                                       QPixmap(":/RemoteControl/resources/bt_remote_off.png"),
159
159
                                                       QPixmap(":/graphicGui/glow32x32.png"),
237
237
 
238
238
void RemoteControl::startServer()
239
239
{
240
 
        Q_ASSERT(httpListener == NULL);
 
240
        Q_ASSERT(httpListener == Q_NULLPTR);
241
241
 
242
242
        //set request handler password settings
243
243
        requestHandler->setPassword(password);
254
254
        if(httpListener)
255
255
        {
256
256
                delete httpListener;
257
 
                httpListener = NULL;
 
257
                httpListener = Q_NULLPTR;
258
258
        }
259
259
}
260
260