[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:54:39
Message-ID: 1120920879.732534.6951.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 433050 by raphael:

KOffice 1.4 Backport

There you go, KexiLabel finally works,
sorry for the recent broken svn revisions...


 M  +34 -0     kexilabel.cpp  
 M  +6 -32     kexilabel.h  


--- branches/koffice/1.4/koffice/kexi/plugins/forms/kexilabel.cpp #433049:433050
@@ -418,6 +418,40 @@
 	QLabel::paintEvent( e );
 }
 
+void KexiLabel::fontChange( const QFont& font ) {
+	p_pixmapDirty = true;
+	p_privateLabel->setFont( font );
+	QLabel::fontChange( font );
+}
+
+void KexiLabel::styleChange( QStyle& style ) {
+	p_pixmapDirty = true;
+	QLabel::styleChange( style );
+}
+
+void KexiLabel::enabledChange( bool enabled ) {
+	p_pixmapDirty = true;
+	p_privateLabel->setEnabled( enabled );
+	QLabel::enabledChange( enabled );
+}
+
+void KexiLabel::paletteChange( const QPalette& pal ) {
+	p_pixmapDirty = true;
+	p_privateLabel->setPalette( pal );
+	QLabel::paletteChange( pal );
+}
+
+void KexiLabel::frameChanged() {
+	p_pixmapDirty = true;
+	p_privateLabel->frameChanged();
+	QFrame::frameChanged();
+}
+
+void KexiLabel::showEvent( QShowEvent* e ) {
+	p_pixmapDirty = true;
+	QLabel::showEvent( e );
+}
+
 void KexiLabel::setValueInternal( const QVariant& add, bool removeOld ) {
 	if (removeOld) 
 		setText(add.toString());
--- branches/koffice/1.4/koffice/kexi/plugins/forms/kexilabel.h #433049:433050
@@ -126,40 +126,14 @@
 		*/
 		virtual void setValueInternal( const QVariant& add, bool removeOld );
 
-		virtual void fontChange( const QFont& font ) {
-			p_pixmapDirty = true;
-			p_privateLabel->setFont( font );
-			QLabel::fontChange( font );
-		}
+		virtual void fontChange( const QFont& font );
+		virtual void styleChange( QStyle& style );
+		virtual void enabledChange( bool enabled );
 
-		virtual void styleChange( QStyle& style ) {
-			p_pixmapDirty = true;
-			QLabel::styleChange( style );
-		}
+		virtual void paletteChange( const QPalette& pal );
+		virtual void frameChanged();
+		virtual void showEvent( QShowEvent* e );
 
-		virtual void enabledChange( bool enabled ) {
-			p_pixmapDirty = true;
-			p_privateLabel->setEnabled( enabled );
-			QLabel::enabledChange( enabled );
-		}
-
-		virtual void paletteChange( const QPalette& pal ) {
-			p_pixmapDirty = true;
-			p_privateLabel->setPalette( pal );
-			QLabel::paletteChange( pal );
-		}
-
-		virtual void frameChanged() {
-			p_pixmapDirty = true;
-			p_privateLabel->frameChanged();
-			QFrame::frameChanged();
-		}
-
-		virtual void showEvent( QShowEvent* e ) {
-			p_pixmapDirty = true;
-			QLabel::showEvent( e );
-		}
-
 	private:
 		void updatePixmapLater();
 
[prev in list] [next in list] [prev in thread] [next in thread]