← Back to branch summary

~ubuntu-branches/ubuntu/maverick/freecad/maverick

« back to all changes in this revision

Viewing changes to src/Gui/BitmapFactory.h

  • Committer: Bazaar Package Importer
  • Author(s): Adam C. Powell, IV
  • Date: 2010-01-11 08:48:33 UTC
  • mfrom: (3.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20100111084833-4g9vgdqbkw8u34zb
Tags: 0.9.2646.5-1
http://bugs.debian.org/561696
http://bugs.debian.org/563523
http://bugs.debian.org/563772
http://bugs.debian.org/560768
* New upstream version (closes: #561696).
* Added swig to Build-Depends (closes: #563523, #563772).
* Removed python-opencv from Build-Depends and Recommends (closes: #560768).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Gui/BitmapFactory.h
25
25
#define GUI_BITMAPFACTORY_H
26
26
 
27
27
#include <Base/Factory.h>
28
 
 
29
 
#ifndef __Qt4All__
30
 
# include "Qt4All.h"
31
 
#endif
 
28
#include <QPixmap>
32
29
 
33
30
// forward declaration
34
31
class SoSFImage;
 
32
class QImage;
35
33
 
36
34
namespace Gui {
37
35
 
130
128
};
131
129
 
132
130
/// Get the global instance
133
 
inline GuiExport BitmapFactoryInst& BitmapFactory(void)
 
131
inline BitmapFactoryInst& BitmapFactory(void)
134
132
{
135
133
    return BitmapFactoryInst::instance();
136
134
}