From 20eb7a844cdc5ced09501aa2d2493827aeccd7df Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Thu, 20 Jan 2011 12:26:11 +0000
Subject: - Migrate to qt4

PR:		ports/154148
Submitted by:	G. Paul Ziemba <p-fbsd-bugs@ziemba.us>
Feature safe:	yes
---
 astro/xglobe/files/patch-desktopwidget.cpp | 32 +++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

(limited to 'astro/xglobe/files/patch-desktopwidget.cpp')

diff --git a/astro/xglobe/files/patch-desktopwidget.cpp b/astro/xglobe/files/patch-desktopwidget.cpp
index b08ea53549fa..9ef3e1498445 100644
--- a/astro/xglobe/files/patch-desktopwidget.cpp
+++ b/astro/xglobe/files/patch-desktopwidget.cpp
@@ -1,10 +1,36 @@
---- desktopwidget.cpp.orig	Sun Jan 26 09:35:35 2003
-+++ desktopwidget.cpp	Sun Jan 26 09:38:52 2003
-@@ -18,6 +18,7 @@
+--- desktopwidget.cpp.orig	1998-12-09 10:15:52.000000000 -0800
++++ desktopwidget.cpp	2011-01-18 22:40:26.000000000 -0800
+@@ -18,10 +18,14 @@
   */
  
  #include <stdio.h>
 +#include <stdlib.h>
  #include "desktopwidget.h"
++//Added by qt3to4:
++#include <QPaintEvent>
++#include <QPixmap>
  
  DesktopWidget::DesktopWidget(QWidget *parent, const char *name)
+-    : QWidget( parent, name, WType_Desktop | WPaintDesktop)
++    : QWidget( parent, name, Qt::WType_Desktop | Qt::WPaintDesktop)
+ {
+   haveImage = FALSE;
+   currentImage = new QPixmap(width(), height());
+@@ -43,6 +47,7 @@
+ {
+   QPainter p(this);
+   
++  printf("DesktopWidget::paintEvent\n");
+   if(!haveImage)
+   {
+     p.setFont(QFont("helvetica", 35));
+@@ -62,7 +67,8 @@
+ 
+ void DesktopWidget::updateDisplay(QImage *image)
+ {
+-  ASSERT(image != NULL);
++  fprintf(stderr, "updateDisplay called\n");
++  Q_ASSERT(image != NULL);
+   currentImage->convertFromImage(*image);
+   haveImage = TRUE;
+   setBackgroundPixmap(*currentImage);
-- 
cgit v1.2.3