Fix more warnings

qgis · Sep 17, 2015 · 245b3f5 · 245b3f5
1 parent 15021ef
commit 245b3f5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/src/plugins/grass/qtermwidget/kpty.h b/src/plugins/grass/qtermwidget/kpty.h
@@ -25,18 +25,15 @@
 
 #include <QObject>
 
-struct KPtyPrivate;
+class KPtyPrivate;
 struct termios;
 
 /**
  * Provides primitives for opening & closing a pseudo TTY pair, assigning the
  * controlling TTY, utmp registration and setting various terminal attributes.
  */
 class KPty {
-    Q_DECLARE_PRIVATE(KPty)
-
-public:
-
+  public:
     /**
      * Constructor
      */
@@ -175,7 +172,7 @@ class KPty {
      */
     int slaveFd() const;
 
-protected:
+  protected:
     /**
      * @internal
      */
@@ -185,6 +182,9 @@ class KPty {
      * @internal
      */
     KPtyPrivate * const d_ptr;
+
+  private:
+    Q_DECLARE_PRIVATE(KPty)
 };
 
 #endif

diff --git a/src/plugins/grass/qtermwidget/kpty_p.h b/src/plugins/grass/qtermwidget/kpty_p.h
@@ -27,8 +27,8 @@
 
 #include <QByteArray>
 
-struct KPtyPrivate {
-
+class KPtyPrivate {
+  public:
     Q_DECLARE_PUBLIC(KPty)
 
     KPtyPrivate(KPty* parent);

diff --git a/src/plugins/grass/qtermwidget/kptydevice.h b/src/plugins/grass/qtermwidget/kptydevice.h
@@ -35,7 +35,7 @@
 
 #define KMAXINT ((int)(~0U >> 1))
 
-struct KPtyDevicePrivate;
+class KPtyDevicePrivate;
 class QSocketNotifier;
 
 #define Q_DECLARE_PRIVATE_MI(Class, SuperClass) \
@@ -332,8 +332,8 @@ class KRingBuffer
     int totalSize;
 };
 
-struct KPtyDevicePrivate : public KPtyPrivate {
-
+class KPtyDevicePrivate : public KPtyPrivate {
+  public:
     Q_DECLARE_PUBLIC(KPtyDevice)
 
     KPtyDevicePrivate(KPty* parent) :

diff --git a/src/plugins/grass/qtermwidget/kptyprocess.h b/src/plugins/grass/qtermwidget/kptyprocess.h
@@ -37,7 +37,7 @@
 
 class KPtyDevice;
 
-struct KPtyProcessPrivate;
+class KPtyProcessPrivate;
 
 /**
  * This class extends KProcess by support for PTYs (pseudo TTYs).
@@ -155,7 +155,8 @@ class KPtyProcess : public KProcess
 // private data //
 //////////////////
 
-struct KPtyProcessPrivate : KProcessPrivate {
+class KPtyProcessPrivate : public KProcessPrivate {
+  public:
     KPtyProcessPrivate() :
         ptyChannels(KPtyProcess::NoChannels),
         addUtmp(false)