summaryrefslogtreecommitdiff
path: root/games/blackjack/files
diff options
context:
space:
mode:
authorTilman Keskinoz <arved@FreeBSD.org>2003-02-02 00:51:30 +0000
committerTilman Keskinoz <arved@FreeBSD.org>2003-02-02 00:51:30 +0000
commitaadeead761de7e6a9efaf4c86569f592572a823e (patch)
tree7e58100336d8a85616e704c723af7312110ca0b8 /games/blackjack/files
parentUnbreak on CURRENT by Using QT3 (diff)
Unbreak on CURRENT by using QT3
Notes
Notes: svn path=/head/; revision=74443
Diffstat (limited to 'games/blackjack/files')
-rw-r--r--games/blackjack/files/patch-aa10
-rw-r--r--games/blackjack/files/patch-ad33
2 files changed, 20 insertions, 23 deletions
diff --git a/games/blackjack/files/patch-aa b/games/blackjack/files/patch-aa
index 06e525f47130..a3bee52beff9 100644
--- a/games/blackjack/files/patch-aa
+++ b/games/blackjack/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig Wed Jun 2 19:28:44 1999
-+++ Makefile Fri May 24 03:57:01 2002
+--- Makefile.orig Thu Jun 3 04:28:44 1999
++++ Makefile Sun Feb 2 01:46:29 2003
@@ -1,9 +1,8 @@
-CC=gcc
@@ -9,8 +9,8 @@
-LDFLAGS=-L$(QTDIR)/lib -lqt
+CC?=gcc
+CXX?=g++
-+INCLUDES=-I$(X11BASE)/include/X11/qt1
-+LDFLAGS=-L$(X11BASE)/lib -lqt1
++INCLUDES=-I$(X11BASE)/include/ ${PTHREAD_CFLAGS}
++LDFLAGS=-L$(X11BASE)/lib -lqt-mt ${PTHREAD_LIBS}
VERSION=1.2
# For systems that don't have install, use this
@@ -28,7 +28,7 @@
insurance_window.o $(METAOBJS)
-MOC=$(QTDIR)/bin/moc
-+MOC=$(X11BASE)/bin/moc1
++MOC=$(X11BASE)/bin/moc
.SUFFIXES: .cpp
diff --git a/games/blackjack/files/patch-ad b/games/blackjack/files/patch-ad
index 924c19d9df1d..e9c40af96079 100644
--- a/games/blackjack/files/patch-ad
+++ b/games/blackjack/files/patch-ad
@@ -1,22 +1,20 @@
---- card.cpp.orig Mon Dec 6 00:45:34 1999
-+++ card.cpp Sat Jun 3 02:47:49 2000
-@@ -201,8 +201,8 @@
+--- card.cpp.orig Sun Dec 5 16:45:34 1999
++++ card.cpp Sun Feb 2 01:06:55 2003
+@@ -201,7 +201,7 @@
QBitmap *bitmap_p = new QBitmap(CARD_W, CARD_H, TRUE);
QBitmap *back_bitmap_p = new QBitmap(logo_width, logo_height, logo_bits,
TRUE);
- QBrush fill(Qt::white);
-- QBrush pattern(Qt::CustomPattern);
-+ QBrush fill(white);
-+ QBrush pattern(CustomPattern);
++ QBrush fill(QColor("white"));
+ QBrush pattern(Qt::CustomPattern);
QPainter painter;
- if ((painter.begin(bitmap_p)) == FALSE) {
@@ -210,7 +210,7 @@
delete (bitmap_p);
bitmap_p = NULL;
} else {
- QBrush fill_ones(Qt::color1);// make a mask so we don't paint the corners
-+ QBrush fill_ones(color1); // make a mask so we don't paint the corners
++ QBrush fill_ones(Qt::color1); // make a mask so we don't paint the corners
painter.setBrush(fill_ones); // make pixmap mask for card
painter.drawRoundRect(0, 0, CARD_W, CARD_H, x_round, y_round);
painter.end();
@@ -25,7 +23,7 @@
pixmap_p = NULL;
} else {
- painter.setPen(Qt::black);
-+ painter.setPen(black);
++ painter.setPen(QColor("black"));
if (bitmap_p) // if we made a mask bitmap
pixmap_p->setMask(*bitmap_p); // set the mask for the pixmap
@@ -34,7 +32,7 @@
painter.drawRoundRect(0, 0, CARD_W, CARD_H, x_round, y_round);
pattern.setPixmap(*back_bitmap_p);
- pattern.setColor(Qt::red);
-+ pattern.setColor(red);
++ pattern.setColor(QColor("red"));
painter.setBrush(pattern); // set up some painter options
painter.drawRoundRect(0, 0, CARD_W, CARD_H, x_round, y_round);
painter.end();
@@ -43,17 +41,16 @@
QPixmap *pixmap_p = new QPixmap(CARD_W, CARD_H);
QBitmap *bitmap_p = new QBitmap(CARD_W, CARD_H, TRUE);
- QBrush fill(Qt::white); // make two brushes, fill and no_fill
-- QBrush no_fill(Qt::NoBrush);
-+ QBrush fill(white); // make two brushes, fill and no_fill
-+ QBrush no_fill(NoBrush);
++ QBrush fill(QColor("white")); // make two brushes, fill and no_fill
+ QBrush no_fill(Qt::NoBrush);
QPainter painter;
if (_suit == HEART || _suit == DIAMOND)
- color = Qt::red;
-+ color = red;
++ color = QColor("red");
else
- color = Qt::black;
-+ color = black;
++ color = QColor("black");
if ((painter.begin(bitmap_p)) == FALSE) {
cerr << "card::makePixmap(): Can't open bitmap paint device\n";
@@ -61,7 +58,7 @@
bitmap_p = NULL;
} else {
- QBrush fill_ones(Qt::color1);// make a mask so we don't paint the corners
-+ QBrush fill_ones(color1); // make a mask so we don't paint the corners
++ QBrush fill_ones(Qt::color1); // make a mask so we don't paint the corners
painter.setBrush(fill_ones); // make pixmap mask for card
painter.drawRoundRect(0, 0, CARD_W, CARD_H, x_round, y_round);
painter.end();
@@ -70,7 +67,7 @@
} else {
painter.setBrush(fill); // set up some painter options
- painter.setPen(Qt::black);
-+ painter.setPen(black);
++ painter.setPen(QColor("black"));
if (bitmap_p) // if we made a mask bitmap
pixmap_p->setMask(*bitmap_p); // set the mask for the pixmap
@@ -79,7 +76,7 @@
painter.setPen(color); // draw rank and suit in corners
- painter.setBackgroundColor(Qt::white);
-+ painter.setBackgroundColor(white);
++ painter.setBackgroundColor(QColor("white"));
painter.drawPixmap(4, 6, *_rank_bitmaps[_rank]);
painter.drawPixmap(4, 23, *_small_suit_bitmaps[_suit]);
painter.setWorldXForm(TRUE); // now draw flipped rank and suit