sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db

Browse Source
This commit is contained in:
Emilio Loi 2013-04-30 10:25:24 +02:00
parent 0704366abe
commit f344e5129c
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/qgsvectordataprovider.h
View File

@ -328,24 +328,18 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
*/
QStringList errors();
<<<<<<< HEAD
<<<<<<< HEAD
/**
* It returns false by default.
* Must be implemented by providers that support saving and loading styles to db returning true
*/
virtual bool isSaveAndLoadStyleToDBSupported() { return false; }
=======
signals:
/** Is emitted, when editing has started */
void editingStarted();
/** Is emitted, when editing stopped */
void editingStopped();
>>>>>>> f3842775a5147b7a8da1639a4bec667a769b7fac
=======
>>>>>>> 009ba1b995536ad9936991524ccd0f53a1a5b558
protected:
QVariant convertValue( QVariant::Type type, QString value );