[prev in list] [next in list] [prev in thread] [next in thread]
List: atlantik-devel
Subject: [atlantik-cvs] CVS: kdegames/atlantik/libatlantikui display_widget.cpp,1.12,1.13 display_widget.h,1.
From: kde () office ! kde ! org
Date: 2002-07-23 10:45:48
[Download RAW message or body]
Update of /home/kde/kdegames/atlantik/libatlantikui
In directory office:/tmp/cvs-serv11480
Modified Files:
display_widget.cpp display_widget.h
Log Message:
- Cleanup
Index: display_widget.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/display_widget.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- display_widget.cpp 2002/07/17 22:39:21 1.12
+++ display_widget.cpp 2002/07/23 10:45:46 1.13
@@ -20,27 +20,26 @@
#include "display_widget.moc"
-BoardDisplay::BoardDisplay(const QString caption, const QString body, QWidget \
*parent, const char *name) : QWidget(parent, name) +BoardDisplay::BoardDisplay(const \
QString &caption, const QString &body, QWidget *parent, const char *name) : \
QWidget(parent, name) {
- m_mainLayout = new QVBoxLayout(this, KDialog::marginHint(), \
KDialog::spacingHint());
- Q_CHECK_PTR(m_mainLayout);
+ QVBoxLayout *mainLayout = new QVBoxLayout(this, KDialog::marginHint(), \
KDialog::spacingHint());
m_textGroupBox = new QVGroupBox(caption, this, "groupBox");
- m_mainLayout->addWidget(m_textGroupBox);
+ mainLayout->addWidget(m_textGroupBox);
- m_label = new QTextEdit(body, NULL, m_textGroupBox);
- m_label->setReadOnly(true);
+ QTextEdit *label = new QTextEdit(body, NULL, m_textGroupBox);
+ label->setReadOnly(true);
m_buttonBox = new QHBoxLayout(this, 0, KDialog::spacingHint());
- m_mainLayout->addItem(m_buttonBox);
+ mainLayout->addItem(m_buttonBox);
m_buttonBox->addItem(new QSpacerItem(20, 20, QSizePolicy::Expanding, \
QSizePolicy::Minimum)); }
-void BoardDisplay::addButton(QString command, QString caption, bool enabled)
+void BoardDisplay::addButton(const QString &command, const QString &caption, bool \
enabled) {
KPushButton *button = new KPushButton(caption, this);
- m_buttonCommandMap[(QObject *)button] = command;
+ m_buttonCommandMap[button] = command;
m_buttonBox->addWidget(button);
button->setEnabled(enabled);
@@ -51,7 +50,8 @@
void BoardDisplay::buttonPressed()
{
- emit buttonCommand(QString(m_buttonCommandMap[(QObject *)QObject::sender()]));
+ QObject *o = QObject::sender();
+ emit buttonCommand(m_buttonCommandMap[o]);
}
void BoardDisplay::slotClicked()
Index: display_widget.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/display_widget.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- display_widget.h 2002/07/17 22:39:21 1.11
+++ display_widget.h 2002/07/23 10:45:46 1.12
@@ -30,9 +30,9 @@
Q_OBJECT
public:
- BoardDisplay(const QString caption, const QString body, QWidget *parent, const char \
*name=0); + BoardDisplay(const QString &caption, const QString &body, QWidget \
*parent, const char *name=0);
- void addButton(const QString command, const QString caption, bool enabled);
+ void addButton(const QString &command, const QString &caption, bool enabled);
private slots:
void buttonPressed();
@@ -42,8 +42,6 @@
void buttonCommand(QString);
private:
- QTextEdit *m_label;
- QVBoxLayout *m_mainLayout;
QHBoxLayout *m_buttonBox;
QVGroupBox *m_textGroupBox;
QMap <QObject *, QString> m_buttonCommandMap;
_______________________________________________
atlantik-cvs mailing list
atlantik-cvs@mail.kde.org
http://mail.kde.org/mailman/listinfo/atlantik-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic