Skip to content

Commit 69cfdc4

Browse files
3nids3nids
committedJan 3, 2018
rename static variables
since they're not really default values
·
ltr-3_40final-3_0_0
1 parent 919cbec commit 69cfdc4

File tree

6 files changed

+28
-28
lines changed

6 files changed

+28
-28
lines changed
 

‎python/core/fieldformatter/qgsdatetimefieldformatter.sip

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ the field configuration.
2121
#include "qgsdatetimefieldformatter.h"
2222
%End
2323
public:
24-
static const QString DEFAULT_DATE_FORMAT;
25-
static const QString DEFAULT_TIME_FORMAT;
26-
static const QString DEFAULT_DATETIME_FORMAT;
27-
static const QString DEFAULT_ISO_FORMAT;
28-
static const QString DEFAULT_ISO_DISPLAY_FORMAT;
24+
static const QString DATE_FORMAT;
25+
static const QString TIME_FORMAT;
26+
static const QString DATETIME_FORMAT;
27+
static const QString QT_ISO_FORMAT;
28+
static const QString DISPLAY_FOR_ISO_FORMAT;
2929

3030
QgsDateTimeFieldFormatter();
3131
%Docstring

‎src/core/fieldformatter/qgsdatetimefieldformatter.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
#include "qgsfield.h"
2020
#include "qgsvectorlayer.h"
2121

22-
const QString QgsDateTimeFieldFormatter::DEFAULT_DATE_FORMAT = QStringLiteral( "yyyy-MM-dd" );
23-
const QString QgsDateTimeFieldFormatter::DEFAULT_TIME_FORMAT = QStringLiteral( "HH:mm:ss" );
24-
const QString QgsDateTimeFieldFormatter::DEFAULT_DATETIME_FORMAT = QStringLiteral( "yyyy-MM-dd HH:mm:ss" );
22+
const QString QgsDateTimeFieldFormatter::DATE_FORMAT = QStringLiteral( "yyyy-MM-dd" );
23+
const QString QgsDateTimeFieldFormatter::TIME_FORMAT = QStringLiteral( "HH:mm:ss" );
24+
const QString QgsDateTimeFieldFormatter::DATETIME_FORMAT = QStringLiteral( "yyyy-MM-dd HH:mm:ss" );
2525
// we need to use Qt::ISODate rather than a string format definition in QDate::fromString
26-
const QString QgsDateTimeFieldFormatter::DEFAULT_ISO_FORMAT = QStringLiteral( "Qt ISO Date" );
26+
const QString QgsDateTimeFieldFormatter::QT_ISO_FORMAT = QStringLiteral( "Qt ISO Date" );
2727
// but QDateTimeEdit::setDisplayFormat only accepts string formats, so use with time zone by default
28-
const QString QgsDateTimeFieldFormatter::DEFAULT_ISO_DISPLAY_FORMAT = QStringLiteral( "yyyy-MM-dd HH:mm:ss+t" );
28+
const QString QgsDateTimeFieldFormatter::DISPLAY_FOR_ISO_FORMAT = QStringLiteral( "yyyy-MM-dd HH:mm:ss+t" );
2929

3030

3131
QString QgsDateTimeFieldFormatter::id() const
@@ -76,12 +76,12 @@ QString QgsDateTimeFieldFormatter::defaultFormat( QVariant::Type type )
7676
switch ( type )
7777
{
7878
case QVariant::DateTime:
79-
return QgsDateTimeFieldFormatter::DEFAULT_DATETIME_FORMAT;
79+
return QgsDateTimeFieldFormatter::DATETIME_FORMAT;
8080
break;
8181
case QVariant::Time:
82-
return QgsDateTimeFieldFormatter::DEFAULT_TIME_FORMAT;
82+
return QgsDateTimeFieldFormatter::TIME_FORMAT;
8383
break;
8484
default:
85-
return QgsDateTimeFieldFormatter::DEFAULT_DATE_FORMAT;
85+
return QgsDateTimeFieldFormatter::DATE_FORMAT;
8686
}
8787
}

‎src/core/fieldformatter/qgsdatetimefieldformatter.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
class CORE_EXPORT QgsDateTimeFieldFormatter : public QgsFieldFormatter
3131
{
3232
public:
33-
static const QString DEFAULT_DATE_FORMAT;
34-
static const QString DEFAULT_TIME_FORMAT;
35-
static const QString DEFAULT_DATETIME_FORMAT;
36-
static const QString DEFAULT_ISO_FORMAT;
37-
static const QString DEFAULT_ISO_DISPLAY_FORMAT;
33+
static const QString DATE_FORMAT;
34+
static const QString TIME_FORMAT;
35+
static const QString DATETIME_FORMAT;
36+
static const QString QT_ISO_FORMAT;
37+
static const QString DISPLAY_FOR_ISO_FORMAT;
3838

3939
/**
4040
* Default constructor of field formatter for a date time field.

‎src/gui/editorwidgets/qgsdatetimeeditconfig.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ QgsDateTimeEditConfig::QgsDateTimeEditConfig( QgsVectorLayer *vl, int fieldIdx,
2424
setupUi( this );
2525

2626
mFieldFormatComboBox->clear();
27-
mFieldFormatComboBox->addItem( tr( "Date" ), QgsDateTimeFieldFormatter::DEFAULT_DATE_FORMAT );
28-
mFieldFormatComboBox->addItem( tr( "Time" ), QgsDateTimeFieldFormatter::DEFAULT_TIME_FORMAT );
29-
mFieldFormatComboBox->addItem( tr( "Date time" ), QgsDateTimeFieldFormatter::DEFAULT_DATETIME_FORMAT );
30-
mFieldFormatComboBox->addItem( tr( "ISO date time" ), QgsDateTimeFieldFormatter::DEFAULT_ISO_FORMAT );
31-
mFieldFormatComboBox->addItem( tr( "Custom" ), "" );
27+
mFieldFormatComboBox->addItem( tr( "Date" ), QgsDateTimeFieldFormatter::DATE_FORMAT );
28+
mFieldFormatComboBox->addItem( tr( "Time" ), QgsDateTimeFieldFormatter::TIME_FORMAT );
29+
mFieldFormatComboBox->addItem( tr( "Date time" ), QgsDateTimeFieldFormatter::DATETIME_FORMAT );
30+
mFieldFormatComboBox->addItem( tr( "ISO date time" ), QgsDateTimeFieldFormatter::QT_ISO_FORMAT );
31+
mFieldFormatComboBox->addItem( tr( "Custom" ), QString() );
3232

3333
mDemoDateTimeEdit->setDateTime( QDateTime::currentDateTime() );
3434

@@ -84,9 +84,9 @@ void QgsDateTimeEditConfig::updateDisplayFormat( const QString &fieldFormat )
8484
if ( mDisplayFormatComboBox->currentIndex() == 0 )
8585
{
8686
// i.e. display format is default
87-
if ( mFieldFormatComboBox->currentData() == QgsDateTimeFieldFormatter::DEFAULT_ISO_FORMAT )
87+
if ( mFieldFormatComboBox->currentData() == QgsDateTimeFieldFormatter::QT_ISO_FORMAT )
8888
{
89-
mDisplayFormatEdit->setText( QgsDateTimeFieldFormatter::DEFAULT_ISO_DISPLAY_FORMAT );
89+
mDisplayFormatEdit->setText( QgsDateTimeFieldFormatter::DISPLAY_FOR_ISO_FORMAT );
9090
}
9191
else
9292
{
@@ -123,7 +123,7 @@ QVariantMap QgsDateTimeEditConfig::config()
123123
{
124124
QVariantMap myConfig;
125125

126-
myConfig.insert( QStringLiteral( "field_iso_format" ), mFieldFormatEdit->text() == QgsDateTimeFieldFormatter::DEFAULT_ISO_FORMAT );
126+
myConfig.insert( QStringLiteral( "field_iso_format" ), mFieldFormatEdit->text() == QgsDateTimeFieldFormatter::QT_ISO_FORMAT );
127127
myConfig.insert( QStringLiteral( "field_format" ), mFieldFormatEdit->text() );
128128
myConfig.insert( QStringLiteral( "display_format" ), mDisplayFormatEdit->text() );
129129
myConfig.insert( QStringLiteral( "calendar_popup" ), mCalendarPopupCheckBox->isChecked() );

‎src/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ QVariant QgsDateTimeSearchWidgetWrapper::value() const
4747
return QDateTime();
4848

4949
const QString fieldFormat = config( QStringLiteral( "field_format" ), QgsDateTimeFieldFormatter::defaultFormat( layer()->fields().at( mFieldIdx ).type() ) ).toString();
50-
if ( fieldFormat == QgsDateTimeFieldFormatter::DEFAULT_ISO_FORMAT )
50+
if ( fieldFormat == QgsDateTimeFieldFormatter::QT_ISO_FORMAT )
5151
{
5252
return mDateTimeEdit->dateTime().toString( Qt::ISODate );
5353
}

‎src/ui/editorwidgets/qgsdatetimeeditconfig.ui

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.