Skip to content

Commit 0a51b13

Browse files
jef-njef-n
committedSep 26, 2015
fix typos
·
ltr-3_40archive/master_2
1 parent 272dd9c commit 0a51b13

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed
 

‎src/core/auth/qgsauthmanager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1625,15 +1625,15 @@ const QPair<QSslCertificate, QSslKey> QgsAuthManager::getCertIdentityBundle( con
16251625
QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey );
16261626
if ( key.isNull() )
16271627
{
1628-
const char* err = QT_TR_NOOP( "Retieve certificate identity bundle: FAILED to create private key" );
1628+
const char* err = QT_TR_NOOP( "Retrieve certificate identity bundle: FAILED to create private key" );
16291629
QgsDebugMsg( err );
16301630
emit messageOut( tr( err ), authManTag(), WARNING );
16311631
return bundle;
16321632
}
16331633
cert = QSslCertificate( query.value( 1 ).toByteArray(), QSsl::Pem );
16341634
if ( cert.isNull() )
16351635
{
1636-
const char* err = QT_TR_NOOP( "Retieve certificate identity bundle: FAILED to create certificate" );
1636+
const char* err = QT_TR_NOOP( "Retrieve certificate identity bundle: FAILED to create certificate" );
16371637
QgsDebugMsg( err );
16381638
emit messageOut( tr( err ), authManTag(), WARNING );
16391639
return bundle;

‎src/gui/auth/qgsauthcertificateinfo.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ QgsAuthCertInfo::QgsAuthCertInfo( QSslCertificate cert,
6969

7070
lblError->setHidden( true );
7171

72-
treeHeirarchy->setRootIsDecorated( false );
72+
treeHierarchy->setRootIsDecorated( false );
7373

74-
connect( treeHeirarchy, SIGNAL( currentItemChanged( QTreeWidgetItem *, QTreeWidgetItem * ) ),
74+
connect( treeHierarchy, SIGNAL( currentItemChanged( QTreeWidgetItem *, QTreeWidgetItem * ) ),
7575
this, SLOT( currentCertItemChanged( QTreeWidgetItem*, QTreeWidgetItem* ) ) );
7676

7777
mCaCertsCache = QgsAuthManager::instance()->getCaCertsCache();
@@ -91,7 +91,7 @@ QgsAuthCertInfo::QgsAuthCertInfo( QSslCertificate cert,
9191
if ( res )
9292
res = populateCertChain();
9393
if ( res )
94-
setCertHeirarchy();
94+
setCertHierarchy();
9595

9696
connect( cmbbxTrust, SIGNAL( currentIndexChanged( int ) ),
9797
this, SLOT( currentPolicyIndexChanged( int ) ) );
@@ -119,7 +119,7 @@ void QgsAuthCertInfo::currentCertItemChanged( QTreeWidgetItem *current, QTreeWid
119119
void QgsAuthCertInfo::updateCurrentCert( QTreeWidgetItem *item )
120120
{
121121
if ( !item )
122-
item = treeHeirarchy->currentItem();
122+
item = treeHierarchy->currentItem();
123123
if ( !item )
124124
return;
125125

@@ -210,7 +210,7 @@ bool QgsAuthCertInfo::populateCertChain()
210210
return true;
211211
}
212212

213-
void QgsAuthCertInfo::setCertHeirarchy()
213+
void QgsAuthCertInfo::setCertHierarchy()
214214
{
215215
QListIterator<QSslCertificate> it( mQCertChain );
216216
it.toBack();
@@ -245,7 +245,7 @@ void QgsAuthCertInfo::setCertHeirarchy()
245245

246246
if ( !previtem )
247247
{
248-
item = new QTreeWidgetItem( treeHeirarchy, QStringList() << cert_source );
248+
item = new QTreeWidgetItem( treeHierarchy, QStringList() << cert_source );
249249
}
250250
else
251251
{
@@ -267,11 +267,11 @@ void QgsAuthCertInfo::setCertHeirarchy()
267267

268268
item->setFirstColumnSpanned( true );
269269
if ( !previtem )
270-
treeHeirarchy->addTopLevelItem( item );
270+
treeHierarchy->addTopLevelItem( item );
271271
previtem = item;
272272
}
273-
treeHeirarchy->setCurrentItem( item, 0, QItemSelectionModel::ClearAndSelect );
274-
treeHeirarchy->expandAll();
273+
treeHierarchy->setCurrentItem( item, 0, QItemSelectionModel::ClearAndSelect );
274+
treeHierarchy->expandAll();
275275
}
276276

277277
void QgsAuthCertInfo::updateCurrentCertInfo( int chainindx )
@@ -857,7 +857,7 @@ void QgsAuthCertInfo::decorateCertTreeItem( const QSslCertificate &cert,
857857
{
858858
if ( !item )
859859
{
860-
item = treeHeirarchy->currentItem();
860+
item = treeHierarchy->currentItem();
861861
}
862862
if ( !item )
863863
{

‎src/gui/auth/qgsauthcertificateinfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class GUI_EXPORT QgsAuthCertInfo : public QWidget, private Ui::QgsAuthCertInfo
8484

8585
bool populateCertChain();
8686

87-
void setCertHeirarchy();
87+
void setCertHierarchy();
8888

8989
void updateCurrentCertInfo( int chainindx );
9090

‎src/ui/auth/qgsauthcertificateinfo.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@
3636
<number>6</number>
3737
</property>
3838
<item>
39-
<widget class="QGroupBox" name="grpbxHeirarchy">
39+
<widget class="QGroupBox" name="grpbxHierarchy">
4040
<property name="sizePolicy">
4141
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
4242
<horstretch>0</horstretch>
4343
<verstretch>1</verstretch>
4444
</sizepolicy>
4545
</property>
4646
<property name="title">
47-
<string>Certificate Heirarchy</string>
47+
<string>Certificate Hierarchy</string>
4848
</property>
4949
<layout class="QVBoxLayout" name="verticalLayout_4">
5050
<property name="leftMargin">
@@ -60,7 +60,7 @@
6060
<number>3</number>
6161
</property>
6262
<item>
63-
<widget class="QTreeWidget" name="treeHeirarchy">
63+
<widget class="QTreeWidget" name="treeHierarchy">
6464
<property name="minimumSize">
6565
<size>
6666
<width>600</width>

‎src/ui/auth/qgsauthimportcertdialog.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<string notr="true">color: rgb(128, 128, 128);</string>
9999
</property>
100100
<property name="text">
101-
<string>Import(s) can contain mutiple certificates</string>
101+
<string>Import(s) can contain multiple certificates</string>
102102
</property>
103103
<property name="alignment">
104104
<set>Qt::AlignCenter</set>

‎src/ui/auth/qgsauthimportidentitydialog.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</sizepolicy>
2727
</property>
2828
<property name="title">
29-
<string>Import identity</string>
29+
<string>Import Identity</string>
3030
</property>
3131
<layout class="QVBoxLayout" name="verticalLayout_2">
3232
<property name="leftMargin">

0 commit comments

Comments
 (0)
Please sign in to comment.