do what the FIXME suggested

[lyx.git] / src / frontends / qt4 / GuiImage.cpp

diff --git a/src/frontends/qt4/GuiImage.cpp b/src/frontends/qt4/GuiImage.cpp
index e8971c4feaaa3f9a87078af428a4197d5ab44bde..75c78a6ee8335b71db7728e7935a009e57a27dec 100644 (file)
--- a/src/frontends/qt4/GuiImage.cpp
+++ b/src/frontends/qt4/GuiImage.cpp
@@ -14,11 +14,11 @@
 #include "GuiImage.h"
 #include "qt_helpers.h"
 
-#include "debug.h"
 #include "Format.h"
 
 #include "graphics/GraphicsParams.h"
 
+#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/lstrings.h"       // ascii_lowercase
 
@@ -26,27 +26,16 @@
 #include <QImage>
 #include <QImageReader>
 
-#include <boost/bind.hpp>
-#include <boost/tuple/tuple.hpp>
-
-using lyx::support::ascii_lowercase;
-
-using boost::bind;
-
-using std::endl;
-using std::equal_to;
-using std::find_if;
-using std::string;
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace graphics {
 
 /// Access to this class is through this static method.
-Image::ImagePtr GuiImage::newImage()
+Image * GuiImage::newImage()
 {
-       ImagePtr ptr;
-       ptr.reset(new GuiImage);
-       return ptr;
+       return new GuiImage;
 }
 
 
@@ -62,13 +51,12 @@ Image::FormatList GuiImage::loadableFormats()
        Formats::const_iterator begin = formats.begin();
        Formats::const_iterator end   = formats.end();
 
-
-//     LYXERR(Debug::GRAPHICS,
-//             "D:/msys/home/yns/src/lyx-devel/lib/images/banner.png mis of format: "
-//             << fromqstr(Pic.pictureFormat("D:/msys/home/yns/src/lyx-devel/lib/images/banner.png")))
-//     if (Pic.pictureFormat("D:/msys/home/yns/src/lyx-devel/lib/images/banner.png"))
-//             LYXERR(Debug::GRAPHICS, "pictureFormat not returned NULL\n"
-//                     << "Supported formats are: " << Pic.inputFormats());
+       //LYXERR(Debug::GRAPHICS,
+       //      "D:/msys/home/yns/src/lyx-devel/lib/images/banner.png mis of format: "
+       //      << fromqstr(Pic.pictureFormat("D:/msys/.../banner.png")))
+       //if (Pic.pictureFormat("D:/msys/.../banner.png"))
+       //      LYXERR(Debug::GRAPHICS, "pictureFormat not returned NULL\n"
+       //              << "Supported formats are: " << Pic.inputFormats());
 
        QList<QByteArray> qt_formats = QImageReader::supportedImageFormats();
 
@@ -88,17 +76,15 @@ Image::FormatList GuiImage::loadableFormats()
                if (ext == "jpeg")
                        ext = "jpg";
 
-               Formats::const_iterator fit =
-                       find_if(begin, end,
-                               bind(equal_to<string>(),
-                                    bind(&Format::extension, _1),
-                                    ext));
-               if (fit != end)
-                       fmts.push_back(fit->name());
+               for (Formats::const_iterator fit = begin; fit != end; ++fit) 
+                       if (fit->extension() == ext) {
+                               fmts.push_back(fit->name());
+                               break;
+                       }
        }
 
        if (lyxerr.debugging()) {
-               LYXERR(Debug::GRAPHICS, "\nOf these, LyX recognises the following formats:");
+               LYXERR(Debug::GRAPHICS, "Of these, LyX recognises the following formats:");
 
                FormatList::const_iterator fbegin = fmts.begin();
                FormatList::const_iterator fend   = fmts.end();
@@ -127,19 +113,19 @@ Image * GuiImage::clone() const
 }
 
 
-unsigned int GuiImage::getWidth() const
+unsigned int GuiImage::width() const
 {
        return transformed_.width();
 }
 
 
-unsigned int GuiImage::getHeight() const
+unsigned int GuiImage::height() const
 {
        return transformed_.height();
 }
 
 
-void GuiImage::load(support::FileName const & filename)
+void GuiImage::load(FileName const & filename)
 {
        if (!original_.isNull()) {
                LYXERR(Debug::GRAPHICS, "Image is loaded already!");
@@ -254,15 +240,13 @@ void GuiImage::scale(Params const & params)
        if (transformed_.isNull())
                return;
 
-       unsigned int width;
-       unsigned int height;
-       boost::tie(width, height) = getScaledDimensions(params);
+       Dimension dim = scaledDimension(params);
 
-       if (width == getWidth() && height == getHeight())
+       if (dim.width() == width() && dim.height() == height())
                return;
 
        QMatrix m;
-       m.scale(double(width) / getWidth(), double(height) / getHeight());
+       m.scale(double(dim.width()) / width(), double(dim.height()) / height());
        transformed_ = transformed_.transformed(m);
 }