Qtopia-interest Archive, February 2008
[PATCH] Make the examples compile with Qt/X11
Message 1 in thread
From 25f26814877e28075c84949502bd4e97c0b17e3b Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@xxxxxxxxxxx>
Date: Mon, 18 Feb 2008 22:12:57 +0100
Subject: [PATCH] Make it compile: The name Display clashed with a system/X11
header
Prefix symbols with a name. Other people might call things Display,
Contact, Record, Message. By prefixing just one char 'Q' you reduce
probability
of a clash tremendously.
This time settle for Phone as prefix.
---
examples/dualdisplaybasic/display.cpp | 16 ++++++++--------
examples/dualdisplaybasic/display.h | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/examples/dualdisplaybasic/display.cpp
b/examples/dualdisplaybasic/display.cpp
index 92b1775..d459e64 100644
--- a/examples/dualdisplaybasic/display.cpp
+++ b/examples/dualdisplaybasic/display.cpp
@@ -46,11 +46,11 @@ static const char * bell_xpm[] = {
" .. ",
" .. "};
-class Display : public QWidget
+class PhoneDisplay : public QWidget
{
Q_OBJECT
public:
- Display(QWidget *parent);
+ PhoneDisplay(QWidget *parent);
void setSignalLevel(int l) { signalLevel = l; }
void setBatteryLevel(int l) { batteryLevel = l; }
@@ -83,13 +83,13 @@ private:
int tid;
};
-Display::Display(QWidget *parent)
+PhoneDisplay::PhoneDisplay(QWidget *parent)
: QWidget(parent), batteryLevel(0), signalLevel(0), missed(0),
messages(0)
{
tid = startTimer(60*1000);
}
-void Display::paintEvent(QPaintEvent *)
+void PhoneDisplay::paintEvent(QPaintEvent *)
{
QPainter p(this);
QPixmap pm(size());
@@ -118,14 +118,14 @@ void Display::paintEvent(QPaintEvent *)
p.drawPixmap(0,0,pm);
}
-void Display::timerEvent(QTimerEvent *e)
+void PhoneDisplay::timerEvent(QTimerEvent *e)
{
if (e->timerId() == tid) {
update();
}
}
-void Display::drawSignal(QPainter *p, const QRect &r)
+void PhoneDisplay::drawSignal(QPainter *p, const QRect &r)
{
p->drawRect(r.x()+3, r.y(), 2, r.height());
for (int i = 0; i < 4; i++)
@@ -139,7 +139,7 @@ void Display::drawSignal(QPainter *p, const QRect &r)
}
}
-void Display::drawBattery(QPainter *p, const QRect &r)
+void PhoneDisplay::drawBattery(QPainter *p, const QRect &r)
{
int w = 20;
p->drawRect(r.x(), r.y(), w-2, r.height());
@@ -194,7 +194,7 @@ BasicDisplay::BasicDisplay(QWidget *parent, Qt::WFlags f)
vb->setMargin(1);
TitleBar *tb = new TitleBar(this);
vb->addWidget(tb);
- display = new Display(this);
+ display = new PhoneDisplay(this);
vb->addWidget(display);
QDesktopWidget *desktop = QApplication::desktop();
QRect desk = desktop->availableGeometry(desktop->primaryScreen());
diff --git a/examples/dualdisplaybasic/display.h
b/examples/dualdisplaybasic/display.h
index 1dfde40..68a08cc 100644
--- a/examples/dualdisplaybasic/display.h
+++ b/examples/dualdisplaybasic/display.h
@@ -22,7 +22,7 @@
#include <qframe.h>
class QPhoneStatus;
-class Display;
+class PhoneDisplay;
class BasicDisplay : public QFrame
{
@@ -37,6 +37,6 @@ protected slots:
private:
QPhoneStatus *status;
- Display *display;
+ PhoneDisplay *display;
};
--
[ signature omitted ]
Message 2 in thread
done
--
[ signature omitted ]
