Fix annotation colors are modified when cancel is clicked

(cherry-picked from 95fd61c)
qgis · Jul 26, 2016 · 6539ae1 · 6539ae1
1 parent 1e454f8
commit 6539ae1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 22 deletions.
diff --git a/src/app/qgsannotationwidget.cpp b/src/app/qgsannotationwidget.cpp
@@ -112,16 +112,6 @@ void QgsAnnotationWidget::on_mMapMarkerButton_clicked()
   }
 }
 
-void QgsAnnotationWidget::on_mFrameColorButton_colorChanged( const QColor &color )
-{
-  if ( !mItem )
-  {
-    return;
-  }
-
-  mItem->setFrameColor( color );
-}
-
 void QgsAnnotationWidget::updateCenterIcon()
 {
   if ( !mMarkerSymbol )
@@ -132,13 +122,3 @@ void QgsAnnotationWidget::updateCenterIcon()
   mMapMarkerButton->setIcon( icon );
 }
 
-void QgsAnnotationWidget::on_mBackgroundColorButton_colorChanged( const QColor &color )
-{
-  if ( !mItem )
-  {
-    return;
-  }
-
-  mItem->setFrameBackgroundColor( color );
-}
-
diff --git a/src/app/qgsannotationwidget.h b/src/app/qgsannotationwidget.h
@@ -36,8 +36,6 @@ class APP_EXPORT QgsAnnotationWidget: public QWidget, private Ui::QgsAnnotationW
 
   private slots:
     void on_mMapMarkerButton_clicked();
-    void on_mFrameColorButton_colorChanged( const QColor &color );
-    void on_mBackgroundColorButton_colorChanged( const QColor &color );
 
   private:
     QgsAnnotationItem* mItem;