[atlantik-cvs] CVS: kdegames/atlantik/libatlantikclient atlantik_network.cpp,1.66,1.67 atlantik_network.h,1.35,1.36
[email protected] Thu, 28 Nov 2002 12:59:27 +0100 (CET)
Newsgroups
gmane.comp.kde.devel.atlantik
Message-ID
<[email protected] >
Update of /home/kde/kdegames/atlantik/libatlantikclient
In directory office:/tmp/cvs-serv16570/libatlantikclient
Modified Files:
atlantik_network.cpp atlantik_network.h
Log Message:
remove display msgs from text
Index: atlantik_network.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikclient/atlantik_network.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- atlantik_network.cpp 2002/11/27 21:08:56 1.66
+++ atlantik_network.cpp 2002/11/28 11:59:24 1.67
@@ -277,29 +277,26 @@
{
estateId = a.value().toInt();
Estate *estate;
- if ((estate = m_atlanticCore->findEstate(a.value().toInt())))
- {
- emit displayDetails(e.attributeNode(QString("text")).value(), estate);
+ estate = m_atlanticCore->findEstate(a.value().toInt());
- bool hasButtons = false;
- for( QDomNode nButtons = n.firstChild() ; !nButtons.isNull() ; nButtons = nButtons.nextSibling() )
+ emit displayDetails(e.attributeNode(QString("text")).value(), estate);
+
+ bool hasButtons = false;
+ for( QDomNode nButtons = n.firstChild() ; !nButtons.isNull() ; nButtons = nButtons.nextSibling() )
+ {
+ QDomElement eButton = nButtons.toElement();
+ if (!eButton.isNull() && eButton.tagName() == "button")
{
QDomElement eButton = nButtons.toElement();
if (!eButton.isNull() && eButton.tagName() == "button")
{
- QDomElement eButton = nButtons.toElement();
- if (!eButton.isNull() && eButton.tagName() == "button")
- {
- emit addCommandButton(eButton.attributeNode(QString("command")).value(), eButton.attributeNode(QString("caption")).value(), eButton.attributeNode(QString("enabled")).value().toInt());
- hasButtons = true;
- }
+ emit addCommandButton(eButton.attributeNode(QString("command")).value(), eButton.attributeNode(QString("caption")).value(), eButton.attributeNode(QString("enabled")).value().toInt());
+ hasButtons = true;
}
}
- if (!hasButtons)
- emit addCloseButton();
}
- else
- displayDefault();
+ if (!hasButtons)
+ emit addCloseButton();
}
}
else if (e.tagName() == "updategamelist")
Index: atlantik_network.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikclient/atlantik_network.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- atlantik_network.h 2002/11/27 21:08:56 1.35
+++ atlantik_network.h 2002/11/28 11:59:25 1.36
@@ -116,7 +116,6 @@
void msgChat(QString, QString);
void displayDetails(QString text, Estate *estate = 0);
- void displayDefault();
void addCommandButton(QString command, QString caption, bool enabled);
void addCloseButton();