Additional Qt4 support...

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1160009 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 15 insertions, 2 deletions

diff --git a/qtinterface/tqpixmap.cpp b/qtinterface/tqpixmap.cpp
index 06dd536..1140a39 100644
--- a/qtinterface/tqpixmap.cpp
+++ b/qtinterface/tqpixmap.cpp
@@ -24,6 +24,9 @@ Boston, MA 02110-1301, USA.
 
 #ifdef USE_QT4
 
+#include <Qt/qbitmap.h>
+#include <qt4/QtGui/private/qpixmapdata_p.h>
+
 bool QPixmap::convertFromImage(const QImage &img, int flags) {
 	return convertFromImage(img, (Qt::ImageConversionFlags)flags);
 }
@@ -37,13 +40,23 @@ void QPixmap::setOptimization( QPixmap::Optimization ) {
 	#warning "QPixmap::setOptimization unimplemented!"
 }
 
-static QPixmap::Optimization defaultOptimization() {
+QPixmap::Optimization defaultOptimization() {
 	#warning "QPixmap::Optimization unimplemented!"
 	return QPixmap::NormalOptim;
 }
 
-static void setDefaultOptimization( QPixmap::Optimization ) {
+void QPixmap::setDefaultOptimization( QPixmap::Optimization ) {
 	#warning "QPixmap::setDefaultOptimization unimplemented!"
 }
 
+QPixmap::QPixmap( int w, int h, int depth, Optimization optim ) {
+	QPixmap(w, h);
+}
+
+const QBitmap *QPixmap::ptrmask() const {
+	QBitmap pm = mask();
+	QBitmap *pr = &pm;
+	return pr;
+}
+
 #endif // USE_QT4
\ No newline at end of file