Differential D21202 Diff 58165 core/script/kjs_display.cpp

Changeset View

Standalone View

View Options

core/script/kjs_display.cpp

  • This file was added.
1​/***************************************************************************
2​ * Copyright (C) 2019 by João Netto <joaonetto901@gmail.com> *
3​ * *
4​ * This program is free software; you can redistribute it and/or modify *
5​ * it under the terms of the GNU General Public License as published by *
6​ * the Free Software Foundation; either version 2 of the License, or *
7​ * (at your option) any later version. *
8​ ***************************************************************************/
9​
10​#include "kjs_display_p.h"
11​
12​#include <kjs/kjsobject.h>
13​#include <kjs/kjsprototype.h>
14​
15​#include <QString>
16​
17​#include <memory>
18​
19​using namespace Okular;
20​
anthonyfieroniUnsubmitted
Not Done

use unique_ptr

anthonyfieroni: use unique_ptr
joaonettoAuthorUnsubmitted
Not Done

Are we talking about the std::unique_ptr?

I followed the template in the other classes, why should we use unique_ptr?

joaonetto: Are we talking about the std::unique_ptr? I followed the template in the other classes, why…
21​std::unique_ptr < KJSPrototype > g_displayProto;
22​
23​// display.hidden
24​static KJSObject displayGetHidden( KJSContext *, void * )
25​{
26​ return KJSBoolean( false );
27​}
28​
29​// display.visible
30​static KJSObject displayGetVisible( KJSContext *, void * )
31​{
32​ return KJSBoolean( true );
33​}
34​
35​void JSDisplay::initType( KJSContext *ctx )
36​{
37​ if ( g_displayProto )
38​ return;
39​
anthonyfieroniUnsubmitted
Done
if (g_displayProto)
    return;
anthonyfieroni: ``` if (g_displayProto) return; ```
joaonettoAuthorUnsubmitted
Not Done

Then we get rid of the initialized bool?

joaonetto: Then we get rid of the initialized bool?
anthonyfieroniUnsubmitted
Done

Yep, also unique_ptr will clear the allocated memory, if you run valgrind, it will point a leak which is not good.

anthonyfieroni: Yep, also unique_ptr will clear the allocated memory, if you run valgrind, it will point a leak…
40​ g_displayProto.reset(new KJSPrototype);
41​
anthonyfieroniUnsubmitted
Done
g_displayProto.reset(new KJSPrototype);
anthonyfieroni: ``` g_displayProto.reset(new KJSPrototype); ```
joaonettoAuthorUnsubmitted
Not Done

And this does not compile

joaonetto: And this does not compile
sanderUnsubmitted
Not Done

g_displayProto needs to be a std::unique_ptr for this to compile.

sander: `g_displayProto` needs to be a `std::unique_ptr` for this to compile.
42​ g_displayProto->defineProperty( ctx, QStringLiteral("hidden"), displayGetHidden );
43​ g_displayProto->defineProperty( ctx, QStringLiteral("visible"), displayGetVisible );
44​}
45​
46​KJSObject JSDisplay::object( KJSContext *ctx )
47​{
48​ return g_displayProto->constructObject( ctx, nullptr );
49​}