Skip to content

Commit 245b3f5

Browse files
committedSep 17, 2015
Fix more warnings
1 parent 15021ef commit 245b3f5

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed
 

‎src/plugins/grass/qtermwidget/kpty.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,15 @@
2525

2626
#include <QObject>
2727

28-
struct KPtyPrivate;
28+
class KPtyPrivate;
2929
struct termios;
3030

3131
/**
3232
* Provides primitives for opening & closing a pseudo TTY pair, assigning the
3333
* controlling TTY, utmp registration and setting various terminal attributes.
3434
*/
3535
class KPty {
36-
Q_DECLARE_PRIVATE(KPty)
37-
38-
public:
39-
36+
public:
4037
/**
4138
* Constructor
4239
*/
@@ -175,7 +172,7 @@ class KPty {
175172
*/
176173
int slaveFd() const;
177174

178-
protected:
175+
protected:
179176
/**
180177
* @internal
181178
*/
@@ -185,6 +182,9 @@ class KPty {
185182
* @internal
186183
*/
187184
KPtyPrivate * const d_ptr;
185+
186+
private:
187+
Q_DECLARE_PRIVATE(KPty)
188188
};
189189

190190
#endif

‎src/plugins/grass/qtermwidget/kpty_p.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
#include <QByteArray>
2929

30-
struct KPtyPrivate {
31-
30+
class KPtyPrivate {
31+
public:
3232
Q_DECLARE_PUBLIC(KPty)
3333

3434
KPtyPrivate(KPty* parent);

‎src/plugins/grass/qtermwidget/kptydevice.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
#define KMAXINT ((int)(~0U >> 1))
3737

38-
struct KPtyDevicePrivate;
38+
class KPtyDevicePrivate;
3939
class QSocketNotifier;
4040

4141
#define Q_DECLARE_PRIVATE_MI(Class, SuperClass) \
@@ -332,8 +332,8 @@ class KRingBuffer
332332
int totalSize;
333333
};
334334

335-
struct KPtyDevicePrivate : public KPtyPrivate {
336-
335+
class KPtyDevicePrivate : public KPtyPrivate {
336+
public:
337337
Q_DECLARE_PUBLIC(KPtyDevice)
338338

339339
KPtyDevicePrivate(KPty* parent) :

‎src/plugins/grass/qtermwidget/kptyprocess.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
class KPtyDevice;
3939

40-
struct KPtyProcessPrivate;
40+
class KPtyProcessPrivate;
4141

4242
/**
4343
* This class extends KProcess by support for PTYs (pseudo TTYs).
@@ -155,7 +155,8 @@ class KPtyProcess : public KProcess
155155
// private data //
156156
//////////////////
157157

158-
struct KPtyProcessPrivate : KProcessPrivate {
158+
class KPtyProcessPrivate : public KProcessPrivate {
159+
public:
159160
KPtyProcessPrivate() :
160161
ptyChannels(KPtyProcess::NoChannels),
161162
addUtmp(false)

0 commit comments

Comments
 (0)
Please sign in to comment.