Skip to content
Permalink
Browse files

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

…les_to_db
  • Loading branch information
Emilio Loi
Emilio Loi committed Apr 30, 2013
1 parent 0704366 commit f344e5129c0f95f1a04b69fd9f3b33614fa4dc3d
Showing with 0 additions and 6 deletions.
  1. +0 −6 src/core/qgsvectordataprovider.h
@@ -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 );

0 comments on commit f344e51

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