summaryrefslogtreecommitdiff
path: root/astro/xglobe/files/patch-earthapp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'astro/xglobe/files/patch-earthapp.cpp')
-rw-r--r--astro/xglobe/files/patch-earthapp.cpp77
1 files changed, 0 insertions, 77 deletions
diff --git a/astro/xglobe/files/patch-earthapp.cpp b/astro/xglobe/files/patch-earthapp.cpp
deleted file mode 100644
index 0ada8e01a975..000000000000
--- a/astro/xglobe/files/patch-earthapp.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
---- earthapp.cpp.orig 1999-12-06 16:14:10 UTC
-+++ earthapp.cpp
-@@ -69,6 +69,12 @@
- #include "config.h"
- #include "earthapp.h"
- #include "moonpos.h"
-+//Added by qt3to4:
-+#include <QPixmap>
-+#include <QPalette>
-+#include <QX11Info>
-+
-+#include <X11/Xlib.h>
-
- /* ------------------------------------------------------------------------*/
-
-@@ -334,7 +340,7 @@ EarthApplication::EarthApplication(int &
- if(use_kde)
- {
- dwidget = new DesktopWidget();
-- ASSERT(dwidget != NULL);
-+ Q_ASSERT(dwidget != NULL);
- dwidget->update();
- }
- }
-@@ -343,9 +349,9 @@ EarthApplication::EarthApplication(int &
-
- EarthApplication::~EarthApplication(void)
- {
-- ASSERT(r != NULL);
-+ Q_ASSERT(r != NULL);
- delete r;
-- ASSERT(timer != NULL);
-+ Q_ASSERT(timer != NULL);
- timer->stop();
- delete timer;
-
-@@ -937,8 +943,8 @@ void EarthApplication::readOutFileName(i
-
- void EarthApplication::randomPosition()
- {
-- view_lat = ((rand()%30001)/30000.)*180. - 90.;
-- view_long = ((rand()%30001)/30000.)*360. - 180.;
-+ view_lat = ((random()%30001)/30000.)*180. - 90.;
-+ view_long = ((random()%30001)/30000.)*360. - 180.;
- }
-
- /* ------------------------------------------------------------------------*/
-@@ -1233,7 +1239,7 @@ void EarthApplication::init()
- r->setRotation(rotation);
-
- timer = new QTimer(this);
-- ASSERT(timer != NULL);
-+ Q_ASSERT(timer != NULL);
-
- connect(timer, SIGNAL(timeout()), this, SLOT(recalc()));
- QTimer::singleShot(1, this, SLOT(recalc())); // this will start rendering
-@@ -1307,7 +1313,19 @@ void EarthApplication::recalc()
- {
- QPixmap pm;
- pm.convertFromImage(*(r->getImage()));
-- desktop()->setBackgroundPixmap(pm);
-+
-+
-+ QPalette palette;
-+ palette.setBrush(desktop()->backgroundRole(), QBrush(pm));
-+ desktop()->setPalette(palette);
-+
-+ //
-+ // With Qt4, this step seems to be necessary to make the
-+ // changes appear immediately. Is there a way to do it via
-+ // Qt4 methods?
-+ //
-+ XClearWindow(QX11Info::display(), QX11Info::appRootWindow());
-+
- if(once)
- {
- processEvents();