Переглянути джерело

Some cosmetic changes as requested by the reviewer of the pull request

Florian Vichot 12 роки тому
батько
коміт
be3896dbef
2 змінених файлів з 10 додано та 10 видалено
  1. 3 3
      Libs/Widgets/ctkCheckBox.cpp
  2. 7 7
      Libs/Widgets/ctkCollapsibleGroupBox.cpp

+ 3 - 3
Libs/Widgets/ctkCheckBox.cpp

@@ -18,9 +18,9 @@
 
 =========================================================================*/
 // QT includes
+#include <QApplication>
 #include <QProxyStyle>
 #include <QStyleOption>
-#include <QApplication>
 
 // CTK includes
 #include "ctkCheckBox.h"
@@ -136,8 +136,8 @@ ctkCheckBoxPrivate::ctkCheckBoxPrivate(ctkCheckBox &object)
 void ctkCheckBoxPrivate::init()
 {
   Q_Q(ctkCheckBox);
-  QWidget * parent = q->parentWidget();
-  QStyle * parentStyle = (parent) ? parent->style() : QApplication::style();
+  QWidget* parent = q->parentWidget();
+  QStyle* parentStyle = (parent) ? parent->style() : QApplication::style();
   this->iconStyle = new ctkCheckBoxStyle(parentStyle);
   q->setStyle(this->iconStyle);
 }

+ 7 - 7
Libs/Widgets/ctkCollapsibleGroupBox.cpp

@@ -19,13 +19,13 @@
 =========================================================================*/
 
 // Qt includes
+#include <QApplication>
 #include <QDebug>
 #include <QChildEvent>
 #include <QMouseEvent>
 #include <QStylePainter>
 #include <QStyleOptionGroupBox>
 #include <QStyle>
-#include <QApplication>
 
 // CTK includes
 #include "ctkCollapsibleGroupBox.h"
@@ -97,7 +97,7 @@ public:
 
 #if QT_VERSION >= 0x040600
   /// Pointer to keep track of the proxy style
-  ctkCollapsibleGroupBoxStyle* ProxyStyle;
+  ctkCollapsibleGroupBoxStyle* GroupBoxStyle;
 #endif
 };
 
@@ -111,7 +111,7 @@ ctkCollapsibleGroupBoxPrivate::ctkCollapsibleGroupBoxPrivate(
   this->MaxHeight = 0;
   this->CollapsedHeight = 14;
 #if QT_VERSION >= 0x040600
-  this->ProxyStyle = 0;
+  this->GroupBoxStyle = 0;
 #endif
 }
 
@@ -124,10 +124,10 @@ void ctkCollapsibleGroupBoxPrivate::init()
 
   this->MaxHeight = q->maximumHeight();
 #if QT_VERSION >= 0x040600
-  QWidget * parent = q->parentWidget();
-  QStyle * parentStyle = (parent) ? parent->style() : QApplication::style();
-  this->ProxyStyle = new ctkCollapsibleGroupBoxStyle(parentStyle);
-  q->setStyle(this->ProxyStyle);
+  QWidget* parent = q->parentWidget();
+  QStyle* parentStyle = (parent) ? parent->style() : QApplication::style();
+  this->GroupBoxStyle = new ctkCollapsibleGroupBoxStyle(parentStyle);
+  q->setStyle(this->GroupBoxStyle);
 #else
   this->setStyleSheet(
     "ctkCollapsibleGroupBox::indicator:checked{"