QgsCharacterSelectorDialog: rename file name according to class name

qgis · May 24, 2017 · 827c19f · 827c19f
1 parent 3f0017a
commit 827c19f
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/python/gui/gui.sip b/python/gui/gui.sip
@@ -36,7 +36,7 @@
 %Include qgscodeeditorhtml.sip
 %Include qgscodeeditorcss.sip
 %End
-%Include qgscharacterselectdialog.sip
+%Include qgscharacterselectordialog.sip
 %Include qgscheckablecombobox.sip
 %Include qgscolorbrewercolorrampdialog.sip
 %Include qgscolorbutton.sip

diff --git a/python/gui/qgscharacterselectdialog.sip → python/gui/qgscharacterselectordialog.sip b/python/gui/qgscharacterselectdialog.sip → python/gui/qgscharacterselectordialog.sip
@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/gui/qgscharacterselectdialog.h                                   *
+ * src/gui/qgscharacterselectordialog.h                                 *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -17,7 +17,7 @@ class QgsCharacterSelectorDialog : QDialog
 %End
 
 %TypeHeaderCode
-#include "qgscharacterselectdialog.h"
+#include "qgscharacterselectordialog.h"
 %End
   public:
     QgsCharacterSelectorDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
@@ -34,7 +34,7 @@ class QgsCharacterSelectorDialog : QDialog
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/gui/qgscharacterselectdialog.h                                   *
+ * src/gui/qgscharacterselectordialog.h                                 *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
diff --git a/python/gui/qgscurveeditorwidget.sip b/python/gui/qgscurveeditorwidget.sip
@@ -9,7 +9,6 @@
 
 
 
-typedef QPointF QwtDoublePoint;
 
 
 class QgsCurveEditorWidget : QWidget

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -174,7 +174,7 @@ SET(QGIS_GUI_SRCS
   qgsblendmodecombobox.cpp
   qgsbrowsertreeview.cpp
   qgsbusyindicatordialog.cpp
-  qgscharacterselectdialog.cpp
+  qgscharacterselectordialog.cpp
   qgscheckablecombobox.cpp
   qgscodeeditor.cpp
   qgscodeeditorcss.cpp
@@ -332,7 +332,7 @@ SET(QGIS_GUI_MOC_HDRS
   qgsblendmodecombobox.h
   qgsbrowsertreeview.h
   qgsbusyindicatordialog.h
-  qgscharacterselectdialog.h
+  qgscharacterselectordialog.h
   qgscheckablecombobox.h
   qgscodeeditor.h
   qgscodeeditorcss.h

diff --git a/src/gui/qgscharacterselectdialog.cpp → src/gui/qgscharacterselectordialog.cpp b/src/gui/qgscharacterselectdialog.cpp → src/gui/qgscharacterselectordialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-    qgscharacterselectdialog.cpp - single font character selector dialog
+    qgscharacterselectordialog.cpp - single font character selector dialog
 
     ---------------------
     begin                : November 2012
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 #include "characterwidget.h"
-#include "qgscharacterselectdialog.h"
+#include "qgscharacterselectordialog.h"
 
 
 QgsCharacterSelectorDialog::QgsCharacterSelectorDialog( QWidget *parent, Qt::WindowFlags fl )

diff --git a/src/gui/qgscharacterselectdialog.h → src/gui/qgscharacterselectordialog.h b/src/gui/qgscharacterselectdialog.h → src/gui/qgscharacterselectordialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-    qgscharacterselectdialog.h - single font character selector dialog
+    qgscharacterselectordialog.h - single font character selector dialog
 
     ---------------------
     begin                : November 2012
@@ -14,14 +14,15 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSCHARACTERSELECTDIALOG_H
-#define QGSCHARACTERSELECTDIALOG_H
+#ifndef QGSCHARACTERSELECTORDIALOG_H
+#define QGSCHARACTERSELECTORDIALOG_H
 
 #include <QDialog>
 #include <QChar>
 #include "qgsguiutils.h"
 #include "ui_qgscharacterselectdialogbase.h"
 #include "qgis_gui.h"
+#include "qgis_sip.h"
 
 class CharacterWidget;
 

diff --git a/src/gui/qgscurveeditorwidget.h b/src/gui/qgscurveeditorwidget.h
@@ -36,7 +36,7 @@ class HistogramItem;
 class QgsCurveEditorPlotEventFilter;
 
 // fix for qwt5/qwt6 QwtDoublePoint vs. QPointF
-typedef QPointF QwtDoublePoint;
+typedef QPointF QwtDoublePoint SIP_SKIP;
 
 #ifndef SIP_RUN
 

diff --git a/src/gui/qgstextformatwidget.cpp b/src/gui/qgstextformatwidget.cpp
@@ -15,7 +15,7 @@
 
 #include "qgstextformatwidget.h"
 #include "qgsmapcanvas.h"
-#include "qgscharacterselectdialog.h"
+#include "qgscharacterselectordialog.h"
 #include "qgslogger.h"
 #include "qgsfontutils.h"
 #include "qgssymbollayerutils.h"