Skip to content
Permalink
Browse files

fix capitalisation: followup 504e50d

  • Loading branch information
slarosa committed Mar 13, 2018
1 parent c586171 commit 281a3ed3aa97382e521544c9e0a1994c7adbbf06
@@ -32,7 +32,7 @@ class QgsManageConnectionsDialog : QDialog
WCS,
Oracle,
GeoNode,
XYZTiles
XyzTiles
};

QgsManageConnectionsDialog( QWidget *parent /TransferThis/ = 0, Mode mode = Export, Type type = WMS, const QString &fileName = QString() );
@@ -133,8 +133,8 @@ void QgsManageConnectionsDialog::doExportImport()
case GeoNode:
doc = saveGeonodeConnections( items );
break;
case XYZTiles:
doc = saveXYZTilesConnections( items );
case XyzTiles:
doc = saveXyzTilesConnections( items );
break;
}

@@ -204,8 +204,8 @@ void QgsManageConnectionsDialog::doExportImport()
case GeoNode:
loadGeonodeConnections( doc, items );
break;
case XYZTiles:
loadXYZTilesConnections( doc, items );
case XyzTiles:
loadXyzTilesConnections( doc, items );
break;
}
// clear connections list and close window
@@ -248,7 +248,7 @@ bool QgsManageConnectionsDialog::populateConnections()
case GeoNode:
settings.beginGroup( QStringLiteral( "/qgis/connections-geonode" ) );
break;
case XYZTiles:
case XyzTiles:
settings.beginGroup( QStringLiteral( "/qgis/connections-xyz" ) );
break;
}
@@ -362,7 +362,7 @@ bool QgsManageConnectionsDialog::populateConnections()
return false;
}
break;
case XYZTiles:
case XyzTiles:
if ( root.tagName() != QLatin1String( "qgsXYZTilesConnections" ) )
{
QMessageBox::information( this, tr( "Loading Connections" ),
@@ -639,7 +639,7 @@ QDomDocument QgsManageConnectionsDialog::saveGeonodeConnections( const QStringLi
return doc;
}

QDomDocument QgsManageConnectionsDialog::saveXYZTilesConnections( const QStringList &connections )
QDomDocument QgsManageConnectionsDialog::saveXyzTilesConnections( const QStringList &connections )
{
QDomDocument doc( QStringLiteral( "connections" ) );
QDomElement root = doc.createElement( QStringLiteral( "qgsXYZTilesConnections" ) );
@@ -1272,7 +1272,7 @@ void QgsManageConnectionsDialog::loadGeonodeConnections( const QDomDocument &doc
}
}

void QgsManageConnectionsDialog::loadXYZTilesConnections( const QDomDocument &doc, const QStringList &items )
void QgsManageConnectionsDialog::loadXyzTilesConnections( const QDomDocument &doc, const QStringList &items )
{
QDomElement root = doc.documentElement();
if ( root.tagName() != QLatin1String( "qgsXYZTilesConnections" ) )
@@ -49,7 +49,7 @@ class GUI_EXPORT QgsManageConnectionsDialog : public QDialog, private Ui::QgsMan
WCS,
Oracle,
GeoNode,
XYZTiles
XyzTiles
};

/**
@@ -73,7 +73,7 @@ class GUI_EXPORT QgsManageConnectionsDialog : public QDialog, private Ui::QgsMan
QDomDocument saveOracleConnections( const QStringList &connections );
QDomDocument saveDb2Connections( const QStringList &connections );
QDomDocument saveGeonodeConnections( const QStringList &connections );
QDomDocument saveXYZTilesConnections( const QStringList &connections );
QDomDocument saveXyzTilesConnections( const QStringList &connections );

void loadOWSConnections( const QDomDocument &doc, const QStringList &items, const QString &service );
void loadWfsConnections( const QDomDocument &doc, const QStringList &items );
@@ -82,7 +82,7 @@ class GUI_EXPORT QgsManageConnectionsDialog : public QDialog, private Ui::QgsMan
void loadOracleConnections( const QDomDocument &doc, const QStringList &items );
void loadDb2Connections( const QDomDocument &doc, const QStringList &items );
void loadGeonodeConnections( const QDomDocument &doc, const QStringList &items );
void loadXYZTilesConnections( const QDomDocument &doc, const QStringList &items );
void loadXyzTilesConnections( const QDomDocument &doc, const QStringList &items );

QString mFileName;
Mode mDialogMode;
@@ -480,14 +480,14 @@ QList<QAction *> QgsXyzTileRootItem::actions( QWidget *parent )

QAction *actionNew = new QAction( tr( "New Connection…" ), parent );
connect( actionNew, &QAction::triggered, this, &QgsXyzTileRootItem::newConnection );
QAction *saveXYZTilesServers = new QAction( tr( "Save Connections…" ), parent );
connect( saveXYZTilesServers, &QAction::triggered, this, &QgsXyzTileRootItem::saveXYZTilesServers );
QAction *loadXYZTilesServers = new QAction( tr( "Load Connections…" ), parent );
connect( loadXYZTilesServers, &QAction::triggered, this, &QgsXyzTileRootItem::loadXYZTilesServers );
QAction *saveXyzTilesServers = new QAction( tr( "Save Connections…" ), parent );
connect( saveXyzTilesServers, &QAction::triggered, this, &QgsXyzTileRootItem::saveXyzTilesServers );
QAction *loadXyzTilesServers = new QAction( tr( "Load Connections…" ), parent );
connect( loadXyzTilesServers, &QAction::triggered, this, &QgsXyzTileRootItem::loadXyzTilesServers );

lst.append( actionNew );
lst.append( saveXYZTilesServers );
lst.append( loadXYZTilesServers );
lst.append( saveXyzTilesServers );
lst.append( loadXyzTilesServers );

return lst;
}
@@ -502,13 +502,13 @@ void QgsXyzTileRootItem::newConnection()
refreshConnections();
}

void QgsXyzTileRootItem::saveXYZTilesServers()
void QgsXyzTileRootItem::saveXyzTilesServers()
{
QgsManageConnectionsDialog dlg( nullptr, QgsManageConnectionsDialog::Export, QgsManageConnectionsDialog::XYZTiles );
QgsManageConnectionsDialog dlg( nullptr, QgsManageConnectionsDialog::Export, QgsManageConnectionsDialog::XyzTiles );
dlg.exec();
}

void QgsXyzTileRootItem::loadXYZTilesServers()
void QgsXyzTileRootItem::loadXyzTilesServers()
{
QString fileName = QFileDialog::getOpenFileName( nullptr, tr( "Load Connections" ), QDir::homePath(),
tr( "XML files (*.xml *XML)" ) );
@@ -517,7 +517,7 @@ void QgsXyzTileRootItem::loadXYZTilesServers()
return;
}

QgsManageConnectionsDialog dlg( nullptr, QgsManageConnectionsDialog::Import, QgsManageConnectionsDialog::XYZTiles, fileName );
QgsManageConnectionsDialog dlg( nullptr, QgsManageConnectionsDialog::Import, QgsManageConnectionsDialog::XyzTiles, fileName );
dlg.exec();
refreshConnections();
}
@@ -146,8 +146,8 @@ class QgsXyzTileRootItem : public QgsDataCollectionItem
private slots:
#ifdef HAVE_GUI
void newConnection();
void saveXYZTilesServers();
void loadXYZTilesServers();
void saveXyzTilesServers();
void loadXyzTilesServers();
#endif
};

0 comments on commit 281a3ed

Please sign in to comment.
You can’t perform that action at this time.