Skip to content

Commit

Permalink
QgsCharacterSelectorDialog: rename file name according to class name
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids committed May 24, 2017
1 parent 3f0017a commit 827c19f
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion python/gui/gui.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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 *
************************************************************************/
Expand All @@ -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 );
Expand All @@ -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 *
************************************************************************/
1 change: 0 additions & 1 deletion python/gui/qgscurveeditorwidget.sip
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@



typedef QPointF QwtDoublePoint;


class QgsCurveEditorWidget : QWidget
Expand Down
4 changes: 2 additions & 2 deletions src/gui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ SET(QGIS_GUI_SRCS
qgsblendmodecombobox.cpp
qgsbrowsertreeview.cpp
qgsbusyindicatordialog.cpp
qgscharacterselectdialog.cpp
qgscharacterselectordialog.cpp
qgscheckablecombobox.cpp
qgscodeeditor.cpp
qgscodeeditorcss.cpp
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/***************************************************************************
qgscharacterselectdialog.cpp - single font character selector dialog
qgscharacterselectordialog.cpp - single font character selector dialog
---------------------
begin : November 2012
Expand All @@ -15,7 +15,7 @@
***************************************************************************/

#include "characterwidget.h"
#include "qgscharacterselectdialog.h"
#include "qgscharacterselectordialog.h"


QgsCharacterSelectorDialog::QgsCharacterSelectorDialog( QWidget *parent, Qt::WindowFlags fl )
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/***************************************************************************
qgscharacterselectdialog.h - single font character selector dialog
qgscharacterselectordialog.h - single font character selector dialog
---------------------
begin : November 2012
Expand All @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgscurveeditorwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgstextformatwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 827c19f

Please sign in to comment.