[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/koffice/1.4/koffice/kexi/plugins/forms
From:       Raphael Langerhorst <raphael-langerhorst () gmx ! at>
Date:       2005-07-09 14:00:36
Message-ID: 1120917636.579651.4738.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 433038 by raphael:

KOffice 1.4 Backport

properly backport KexiLabelPrivate move
(fixes last branch commit)


 M  +10 -14    kexilabel.cpp  
 M  +2 -14     kexilabel.h  


--- branches/koffice/1.4/koffice/kexi/plugins/forms/kexilabel.cpp #433037:433038
@@ -34,21 +34,17 @@
 #define SHADOW_THICKNESS 1
 
 class KexiLabelPrivate : public QLabel {
-		friend class KexiLabel;
-	public:
-		KexiLabelPrivate( KexiLabel* );
-		virtual ~KexiLabelPrivate();
+                friend class KexiLabel;
+        public:
+                KexiLabelPrivate( KexiLabel* );
+                virtual ~KexiLabelPrivate();
+        private:
+                QImage makeShadow( const QImage& textImage, const QColor &bgColor, \
const QRect& boundingRect ); +                QRect getBounding( const QImage &image, \
const QRect& startRect ); +//              double defaultDecay( QImage& source, int \
i, int j ); +                KPixmap getShadowPixmap();
 
-	protected:
-		void updateFrame();
-
-		QImage makeShadow( const QImage& textImage, const QColor &bgColor, const QRect& \
                boundingRect );
-		QRect getBounding( const QImage &image, const QRect& startRect );
-//		double defaultDecay( QImage& source, int i, int j );
-		KPixmap getShadowPixmap();
-
-		QRect p_shadowRect;
-		KexiLabel *p_parentLabel;
+                QRect p_shadowRect;
 };
 
 KexiLabelPrivate::KexiLabelPrivate( KexiLabel* parent )
--- branches/koffice/1.4/koffice/kexi/plugins/forms/kexilabel.h #433037:433038
@@ -31,21 +31,8 @@
 class QPainter;
 class QTimer;
 class KexiLabel;
+class KexiLabelPrivate;
 
-class KexiLabelPrivate : public QLabel {
-		friend class KexiLabel;
-	public:
-		KexiLabelPrivate( KexiLabel* );
-		virtual ~KexiLabelPrivate();
-	private:
-		QImage makeShadow( const QImage& textImage, const QColor &bgColor, const QRect& \
                boundingRect );
-		QRect getBounding( const QImage &image, const QRect& startRect );
-//		double defaultDecay( QImage& source, int i, int j );
-		KPixmap getShadowPixmap();
-
-		QRect p_shadowRect;
-};
-
 /**
 An extended, data-aware, read-only text label.
 It's text may have a drop-shadow.
@@ -173,6 +160,7 @@
 			QLabel::showEvent( e );
 		}
 
+	private:
 		void updatePixmapLater();
 
 		KPixmap p_shadowPixmap;


[prev in list] [next in list] [prev in thread] [next in thread]