Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

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

diff --git a/src/frontends/qt4/GuiImage.h b/src/frontends/qt4/GuiImage.h
index 57cc49e6897c9c7a942a34d3fa78817309ddab67..675053619fc98a832198d3f2ec3b8bfb79961b37 100644 (file)
--- a/src/frontends/qt4/GuiImage.h
+++ b/src/frontends/qt4/GuiImage.h
@@ -10,23 +10,22 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef QLIMAGE_H
-#define QLIMAGE_H
-
+#ifndef GUIIMAGE_H
+#define GUIIMAGE_H
 
 #include "graphics/GraphicsImage.h"
 
-#include <qimage.h>
-//Added by qt3to4:
+#include <QImage>
 #include <QPixmap>
 
 namespace lyx {
 namespace graphics {
 
-class QLImage : public Image {
+class GuiImage : public Image
+{
 public:
        /// Access to this class is through this static method.
-       static ImagePtr newImage();
+       static Image * newImage();
 
        /// Return the list of loadable formats.
        static FormatList loadableFormats();
@@ -39,36 +38,36 @@ public:
 
 private:
        /// Create a copy
-       virtual Image * clone_impl() const;
+       virtual Image * clone() const;
        /// Get the image width
-       virtual unsigned int getWidth_impl() const;
+       virtual unsigned int width() const;
        /// Get the image height
-       virtual unsigned int getHeight_impl() const;
+       virtual unsigned int height() const;
        // FIXME Is the image drawable ?
-       virtual bool isDrawable_impl() const { return true; }
+       virtual bool isDrawable() const { return true; }
        /**
         * Load the image file into memory.
         * The process is asynchronous, so this method starts the loading.
         * When finished, the Image::finishedLoading signal is emitted.
         */
-       virtual void load_impl(support::FileName const & filename);
+       virtual void load(support::FileName const & filename);
        /**
         * Finishes the process of modifying transformed_, using
         * \c params to decide on color, grayscale etc.
         * \returns true if successful.
         */
-       virtual bool setPixmap_impl(Params const & params);
+       virtual bool setPixmap(Params const & params);
        /// Clip the image using params.
-       virtual void clip_impl(Params const & params);
+       virtual void clip(Params const & params);
        /// Rotate the image using params.
-       virtual void rotate_impl(Params const & params);
+       virtual void rotate(Params const & params);
        /// Scale the image using params.
-       virtual void scale_impl(Params const & params);
+       virtual void scale(Params const & params);
 
        /// Access to the class is through newImage() and clone.
-       QLImage();
+       GuiImage() {}
        ///
-       QLImage(QLImage const &);
+       GuiImage(GuiImage const &);
 
        /// The original loaded image.
        QImage original_;
@@ -82,4 +81,4 @@ private:
 } // namespace graphics
 } // namespace lyx
 
-#endif // QLIMAGE_H
+#endif // GUIIMAGE_H