Remove unused abstract class PreviewFillable

PreviewHolder is the only implementation.

6 files changed, 28 insertions, 96 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index b9933bba6..cb120806a 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -189,7 +189,6 @@ set(ui_SRC
 	interface.h
     monitor.h
 	previewable.h
-	previewfillable.h
 	previewholder.h
 	selected-color.h
 	shape-editor.h
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 1fc77ade8..5c0deda62 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -567,7 +567,6 @@ SwatchesPanel& SwatchesPanel::getInstance()
 SwatchesPanel::SwatchesPanel(gchar const* prefsPath) :
     Inkscape::UI::Widget::Panel(prefsPath, SP_VERB_DIALOG_SWATCHES),
     _menu(0),
-    _fillable(0),
     _holder(0),
     _clear(0),
     _remove(0),
@@ -576,7 +575,6 @@ SwatchesPanel::SwatchesPanel(gchar const* prefsPath) :
     _currentDocument(0)
 {
     _holder = new PreviewHolder();
-    _setTargetFillable(_holder);
 
     _build_menu();
 
@@ -891,25 +889,25 @@ void SwatchesPanel::_updateSettings(int settings, int value)
     case SWATCHES_SETTINGS_SIZE: {
         prefs->setInt(_prefs_path + "/panel_size", value);
 
-        ViewType curr_type = _fillable->getPreviewType();
-        guint curr_ratio = _fillable->getPreviewRatio();
-        ::BorderStyle curr_border = _fillable->getPreviewBorder();
+        ViewType curr_type = _holder->getPreviewType();
+        guint curr_ratio = _holder->getPreviewRatio();
+        ::BorderStyle curr_border = _holder->getPreviewBorder();
 
         switch (value) {
         case 0:
-            _fillable->setStyle(::PREVIEW_SIZE_TINY, curr_type, curr_ratio, curr_border);
+            _holder->setStyle(::PREVIEW_SIZE_TINY, curr_type, curr_ratio, curr_border);
             break;
         case 1:
-            _fillable->setStyle(::PREVIEW_SIZE_SMALL, curr_type, curr_ratio, curr_border);
+            _holder->setStyle(::PREVIEW_SIZE_SMALL, curr_type, curr_ratio, curr_border);
             break;
         case 2:
-            _fillable->setStyle(::PREVIEW_SIZE_MEDIUM, curr_type, curr_ratio, curr_border);
+            _holder->setStyle(::PREVIEW_SIZE_MEDIUM, curr_type, curr_ratio, curr_border);
             break;
         case 3:
-            _fillable->setStyle(::PREVIEW_SIZE_BIG, curr_type, curr_ratio, curr_border);
+            _holder->setStyle(::PREVIEW_SIZE_BIG, curr_type, curr_ratio, curr_border);
             break;
         case 4:
-            _fillable->setStyle(::PREVIEW_SIZE_HUGE, curr_type, curr_ratio, curr_border);
+            _holder->setStyle(::PREVIEW_SIZE_HUGE, curr_type, curr_ratio, curr_border);
             break;
         default:
             break;
@@ -920,15 +918,15 @@ void SwatchesPanel::_updateSettings(int settings, int value)
     case SWATCHES_SETTINGS_MODE: {
         prefs->setInt(_prefs_path + "/panel_mode", value);
 
-        ::PreviewSize curr_size = _fillable->getPreviewSize();
-        guint curr_ratio = _fillable->getPreviewRatio();
-        ::BorderStyle curr_border = _fillable->getPreviewBorder();
+        ::PreviewSize curr_size = _holder->getPreviewSize();
+        guint curr_ratio = _holder->getPreviewRatio();
+        ::BorderStyle curr_border = _holder->getPreviewBorder();
         switch (value) {
         case 0:
-            _fillable->setStyle(curr_size, VIEW_TYPE_LIST, curr_ratio, curr_border);
+            _holder->setStyle(curr_size, VIEW_TYPE_LIST, curr_ratio, curr_border);
             break;
         case 1:
-            _fillable->setStyle(curr_size, VIEW_TYPE_GRID, curr_ratio, curr_border);
+            _holder->setStyle(curr_size, VIEW_TYPE_GRID, curr_ratio, curr_border);
             break;
         default:
             break;
@@ -938,29 +936,29 @@ void SwatchesPanel::_updateSettings(int settings, int value)
     case SWATCHES_SETTINGS_SHAPE: {
         prefs->setInt(_prefs_path + "/panel_ratio", value);
 
-        ViewType curr_type = _fillable->getPreviewType();
-        ::PreviewSize curr_size = _fillable->getPreviewSize();
-        ::BorderStyle curr_border = _fillable->getPreviewBorder();
+        ViewType curr_type = _holder->getPreviewType();
+        ::PreviewSize curr_size = _holder->getPreviewSize();
+        ::BorderStyle curr_border = _holder->getPreviewBorder();
 
-        _fillable->setStyle(curr_size, curr_type, value, curr_border);
+        _holder->setStyle(curr_size, curr_type, value, curr_border);
         break;
     }
     case SWATCHES_SETTINGS_BORDER: {
         prefs->setInt(_prefs_path + "/panel_border", value);
 
-        ::PreviewSize curr_size = _fillable->getPreviewSize();
-        ViewType curr_type = _fillable->getPreviewType();
-        guint curr_ratio = _fillable->getPreviewRatio();
+        ::PreviewSize curr_size = _holder->getPreviewSize();
+        ViewType curr_type = _holder->getPreviewType();
+        guint curr_ratio = _holder->getPreviewRatio();
 
         switch (value) {
         case 0:
-            _fillable->setStyle(curr_size, curr_type, curr_ratio, BORDER_NONE);
+            _holder->setStyle(curr_size, curr_type, curr_ratio, BORDER_NONE);
             break;
         case 1:
-            _fillable->setStyle(curr_size, curr_type, curr_ratio, BORDER_SOLID);
+            _holder->setStyle(curr_size, curr_type, curr_ratio, BORDER_SOLID);
             break;
         case 2:
-            _fillable->setStyle(curr_size, curr_type, curr_ratio, BORDER_WIDE);
+            _holder->setStyle(curr_size, curr_type, curr_ratio, BORDER_WIDE);
             break;
         default:
             break;
@@ -969,7 +967,7 @@ void SwatchesPanel::_updateSettings(int settings, int value)
     }
     case SWATCHES_SETTINGS_WRAP: {
         prefs->setBool(_prefs_path + "/panel_wrap", value);
-        _fillable->setWrap(value);
+        _holder->setWrap(value);
         break;
     }
     case SWATCHES_SETTINGS_PALETTE: {
@@ -994,11 +992,6 @@ void SwatchesPanel::_wrapToggled(Gtk::CheckMenuItem* toggler)
     }
 }
 
-void SwatchesPanel::_setTargetFillable(PreviewFillable *target)
-{
-    _fillable = target;
-}
-
 void SwatchesPanel::_regItem(Gtk::MenuItem* item, int id)
 {
     _menu->append(*item);
diff --git a/src/ui/dialog/swatches.h b/src/ui/dialog/swatches.h
index 19db69338..a9e3b9b92 100644
--- a/src/ui/dialog/swatches.h
+++ b/src/ui/dialog/swatches.h
@@ -21,7 +21,6 @@ namespace Gtk {
 namespace Inkscape {
 namespace UI {
 
-class PreviewFillable;
 class PreviewHolder;
 
 namespace Dialogs {
@@ -76,8 +75,6 @@ private:
     SPDesktop*  _currentDesktop;
     SPDocument* _currentDocument;
 
-
-    void _setTargetFillable(PreviewFillable *target);
     void _regItem(Gtk::MenuItem* item, int id);
 
     void _updateSettings(int settings, int value);
@@ -85,7 +82,6 @@ private:
     void _wrapToggled(Gtk::CheckMenuItem *toggler);
 
     Gtk::Menu       *_menu;
-    PreviewFillable *_fillable;
 
     sigc::connection _documentConnection;
     sigc::connection _selChanged;
diff --git a/src/ui/previewfillable.h b/src/ui/previewfillable.h
deleted file mode 100644
index 044357503..000000000
--- a/src/ui/previewfillable.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-#ifndef SEEN_PREVIEWFILLABLE_H
-#define SEEN_PREVIEWFILLABLE_H
-/*
- * A simple interface for previewing representations.
- *
- * Authors:
- *   Jon A. Cruz
- *
- * Copyright (C) 2005 Jon A. Cruz
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-
-#include "previewable.h"
-#include "../widgets/eek-preview.h"
-#include "enums.h"
-
-namespace Inkscape {
-namespace UI {
-
-class PreviewFillable
-{
-public:
-    virtual ~PreviewFillable() {}
-    virtual void clear() = 0;
-    virtual void addPreview( Previewable* preview ) = 0;
-    virtual void freezeUpdates() = 0;
-    virtual void thawUpdates() = 0;
-    virtual void setStyle( ::PreviewSize size, ViewType type, guint ratio, ::BorderStyle border ) = 0;
-    virtual void setOrientation(SPAnchorType how) = 0;
-    virtual ::PreviewSize getPreviewSize() const = 0;
-    virtual ViewType getPreviewType() const = 0;
-    virtual guint getPreviewRatio() const = 0;
-    virtual ::BorderStyle getPreviewBorder() const = 0;
-    virtual void setWrap( bool b ) = 0;
-    virtual bool getWrap() const = 0;
-};
-
-
-} //namespace UI
-} //namespace Inkscape
-
-
-#endif // SEEN_PREVIEWFILLABLE_H
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp
index a7d2c97ff..4a16e64a9 100644
--- a/src/ui/previewholder.cpp
+++ b/src/ui/previewholder.cpp
@@ -11,6 +11,7 @@
  */
 
 
+#include "previewable.h"
 #include "previewholder.h"
 
 #include <gtkmm/scrolledwindow.h>
@@ -31,7 +32,6 @@ namespace UI {
 
 PreviewHolder::PreviewHolder() :
     Box(),
-    PreviewFillable(),
     _scroller(0),
     _insides(0),
     _prefCols(0),
diff --git a/src/ui/previewholder.h b/src/ui/previewholder.h
index 9f6d4807e..1aeec476d 100644
--- a/src/ui/previewholder.h
+++ b/src/ui/previewholder.h
@@ -24,14 +24,15 @@ class Grid;
 class ScrolledWindow;
 }
 
-#include "previewfillable.h"
 #include "../widgets/eek-preview.h"
 #include "enums.h"
 
 namespace Inkscape {
 namespace UI {
 
-class PreviewHolder : public Gtk::Box, public PreviewFillable
+class Previewable;
+
+class PreviewHolder : public Gtk::Box
 {
 public:
     PreviewHolder();