Commit 2fb4cbcc authored by Laurent Montel's avatar Laurent Montel 😁

kdelibs4support--

parent 29c1d7a1
......@@ -69,7 +69,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="KPushButton" name="connectbutton">
<widget class="QPushButton" name="connectbutton">
<property name="text">
<string>Connect</string>
</property>
......@@ -175,7 +175,7 @@
</widget>
</item>
<item row="2" column="2">
<widget class="KPushButton" name="joinroombutton">
<widget class="QPushButton" name="joinroombutton">
<property name="text">
<string>Join Room</string>
</property>
......@@ -237,7 +237,7 @@
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="KPushButton" name="startnewgamebutton">
<widget class="QPushButton" name="startnewgamebutton">
<property name="enabled">
<bool>false</bool>
</property>
......@@ -247,7 +247,7 @@
</widget>
</item>
<item>
<widget class="KPushButton" name="joingamebutton">
<widget class="QPushButton" name="joingamebutton">
<property name="enabled">
<bool>false</bool>
</property>
......@@ -257,7 +257,7 @@
</widget>
</item>
<item>
<widget class="KPushButton" name="loadsavedgamebutton">
<widget class="QPushButton" name="loadsavedgamebutton">
<property name="enabled">
<bool>false</bool>
</property>
......@@ -313,7 +313,7 @@
</spacer>
</item>
<item>
<widget class="KPushButton" name="cancelbutton">
<widget class="QPushButton" name="cancelbutton">
<property name="text">
<string>Cancel</string>
</property>
......@@ -329,11 +329,6 @@
<extends>QWidget</extends>
<header>kled.h</header>
</customwidget>
<customwidget>
<class>KPushButton</class>
<extends>QPushButton</extends>
<header>kpushbutton.h</header>
</customwidget>
<customwidget>
<class>KLineEdit</class>
<extends>QLineEdit</extends>
......
......@@ -207,7 +207,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="KPushButton" name="cancelButton">
<widget class="QPushButton" name="cancelButton">
<property name="text">
<string>Cancel</string>
</property>
......@@ -227,14 +227,14 @@
</spacer>
</item>
<item>
<widget class="KPushButton" name="previousButton">
<widget class="QPushButton" name="previousButton">
<property name="text">
<string>&lt;&lt; Previous</string>
</property>
</widget>
</item>
<item>
<widget class="KPushButton" name="finishButton">
<widget class="QPushButton" name="finishButton">
<property name="text">
<string>Start</string>
</property>
......@@ -244,13 +244,6 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KPushButton</class>
<extends>QPushButton</extends>
<header>kpushbutton.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>finishButton</tabstop>
<tabstop>previousButton</tabstop>
......
......@@ -121,7 +121,7 @@ Choose one of them. It will be your nation during the game</string>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="KPushButton" name="cancelButton">
<widget class="QPushButton" name="cancelButton">
<property name="text">
<string>Cancel</string>
</property>
......@@ -141,14 +141,14 @@ Choose one of them. It will be your nation during the game</string>
</spacer>
</item>
<item>
<widget class="KPushButton" name="previousButton">
<widget class="QPushButton" name="previousButton">
<property name="text">
<string>&lt;&lt; Previous</string>
</property>
</widget>
</item>
<item>
<widget class="KPushButton" name="nextButton">
<widget class="QPushButton" name="nextButton">
<property name="text">
<string>Next &gt;&gt;</string>
</property>
......@@ -158,13 +158,6 @@ Choose one of them. It will be your nation during the game</string>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KPushButton</class>
<extends>QPushButton</extends>
<header>kpushbutton.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>nameLineEdit</tabstop>
<tabstop>nationCombo</tabstop>
......
......@@ -8,6 +8,7 @@ include_directories(
########### next target ###############
set(ksirkskineditor_SRCS
ksirkskineditor_debug.cpp
main.cpp
mainwindow.cpp
ksirkSkinEditorConfigDialog.cpp
......
......@@ -23,7 +23,7 @@
#include "onu.h"
#include <KLocalizedString>
#include <kdebug.h>
#include "ksirkskineditor_debug.h"
#include <qsvgrenderer.h>
#include <QString>
#include <QApplication>
......@@ -57,42 +57,42 @@ Country::Country(
m_renderer(new QSvgRenderer()),
m_highlighting_locked(false)
{
// kDebug() << m_name << ", " << this << endl;
// qCDebug(KSIRKSKINEDITOR_LOG) << m_name << ", " << this << endl;
}
Country::~Country()
{
// kDebug() << "Deleting country " << m_name << ", " << this << endl;
// qCDebug(KSIRKSKINEDITOR_LOG) << "Deleting country " << m_name << ", " << this << endl;
delete m_renderer;
}
void Country::reset()
{
// kDebug() << "Country::reset " << m_name << endl;
// qCDebug(KSIRKSKINEDITOR_LOG) << "Country::reset " << m_name << endl;
}
bool Country::communicateWith(const Country* otherCountry) const
{
if (!otherCountry)
{
kDebug() << "OUT otherCountry null Country::communicateWith" << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "OUT otherCountry null Country::communicateWith" << endl;
return false;
}
// a country is considered to communicate with itself
if (otherCountry == this) {return true;}
// kDebug() << "Country::communicateWith (" << name() << ", " << otherCountry-> name() << ")" << endl << flush;
// qCDebug(KSIRKSKINEDITOR_LOG) << "Country::communicateWith (" << name() << ", " << otherCountry-> name() << ")" << endl << flush;
unsigned int nbNeighbours = neighbours().size();
for (unsigned int i = 0; i < nbNeighbours; i++)
{
if (neighbours().at(i) == otherCountry)
{
// kDebug() << "OUT true Country::communicateWith" << endl << flush;
// qCDebug(KSIRKSKINEDITOR_LOG) << "OUT true Country::communicateWith" << endl << flush;
return true;
}
}
// kDebug() << "OUT false Country::communicateWith" << endl << flush;
// qCDebug(KSIRKSKINEDITOR_LOG) << "OUT false Country::communicateWith" << endl << flush;
return false;
}
......@@ -133,7 +133,7 @@ const QPointF& Country::pointInfantry() const
void Country::anchorPoint(const QPointF pt)
{
kDebug() << pt;
qCDebug(KSIRKSKINEDITOR_LOG) << pt;
m_anchorPoint = pt;
}
......@@ -171,20 +171,20 @@ void Country::neighbours(const QList<Country*>& neighboursVect)
/** No descriptions */
QList< Country* >& Country::neighbours()
{
// kDebug() << "Country::neighbours" << endl << flush;
// qCDebug(KSIRKSKINEDITOR_LOG) << "Country::neighbours" << endl << flush;
return m_neighbours;
}
/** No descriptions */
const QList< Country* >& Country::neighbours() const
{
// kDebug() << "Country::neighbours const" << endl << flush;
// qCDebug(KSIRKSKINEDITOR_LOG) << "Country::neighbours const" << endl << flush;
return m_neighbours;
}
void Country::highlight(QGraphicsScene* scene, ONU* onu, const QColor& color, qreal opacity)
{
kDebug() << m_name << color << opacity;
qCDebug(KSIRKSKINEDITOR_LOG) << m_name << color << opacity;
if (m_highlighting_locked)
{
return;
......@@ -194,25 +194,25 @@ void Country::highlight(QGraphicsScene* scene, ONU* onu, const QColor& color, qr
QDomNode countryElement = onu->svgDom()->elementById(m_name);
if (countryElement.isNull())
{
kWarning() << "Got a null element" << endl;
qCWarning(KSIRKSKINEDITOR_LOG) << "Got a null element" << endl;
return;
}
// kDebug() <<"got country"<< endl;
// qCDebug(KSIRKSKINEDITOR_LOG) <<"got country"<< endl;
onu->svgDom()->setCurrentNode(countryElement);
onu->svgDom()->setStyleProperty("fill", color.name());
onu->svgDom()->setStyleProperty("fill-opacity", QString::number(opacity));
// kDebug() <<"loading"<< endl;
// qCDebug(KSIRKSKINEDITOR_LOG) <<"loading"<< endl;
QByteArray svg = onu->svgDom()->nodeToByteArray();
m_renderer->load(svg);
// kDebug() <<"loaded"<< endl;
// qCDebug(KSIRKSKINEDITOR_LOG) <<"loaded"<< endl;
m_highlighting = new QGraphicsSvgItem();
m_highlighting->setSharedRenderer(m_renderer);
m_highlighting->setElementId(m_name);
kDebug() << "anchor point=" << m_anchorPoint;
kDebug() << "set highlighting pos to " << (m_anchorPoint.x()-m_highlighting->boundingRect().width()/2)
qCDebug(KSIRKSKINEDITOR_LOG) << "anchor point=" << m_anchorPoint;
qCDebug(KSIRKSKINEDITOR_LOG) << "set highlighting pos to " << (m_anchorPoint.x()-m_highlighting->boundingRect().width()/2)
<< (m_anchorPoint.y()-m_highlighting->boundingRect().height()/2) ;
m_highlighting->setPos(
(m_anchorPoint.x()-m_highlighting->boundingRect().width()/2),
......@@ -220,30 +220,30 @@ void Country::highlight(QGraphicsScene* scene, ONU* onu, const QColor& color, qr
m_highlighting->setZValue(5);
scene->addItem(m_highlighting);
// m_highlighting->scale(onu->zoom(), onu->zoom());
// kDebug() << "done" << endl;
// qCDebug(KSIRKSKINEDITOR_LOG) << "done" << endl;
}
void Country::clearHighlighting()
{
// kDebug() << m_highlighting_locked << (void*)m_highlighting;
// qCDebug(KSIRKSKINEDITOR_LOG) << m_highlighting_locked << (void*)m_highlighting;
if (!m_highlighting_locked && m_highlighting!=0)
{
m_highlighting->hide();
delete m_highlighting;
m_highlighting = 0;
}
// kDebug() << "done" << endl;
// qCDebug(KSIRKSKINEDITOR_LOG) << "done" << endl;
}
bool Country::isHighlightingLocked()
{
// kDebug();
// qCDebug(KSIRKSKINEDITOR_LOG);
return m_highlighting_locked;
}
void Country::releaseHighlightingLock()
{
// kDebug();
// qCDebug(KSIRKSKINEDITOR_LOG);
m_highlighting_locked=false;
}
......@@ -254,7 +254,7 @@ QDataStream& operator>>(QDataStream& stream, Country* country)
quint32 nbArmies, nbAddedArmies;
QString ownerName;
stream >> ownerName >> nbArmies >> nbAddedArmies;
kDebug() << ownerName << nbArmies << nbAddedArmies;
qCDebug(KSIRKSKINEDITOR_LOG) << ownerName << nbArmies << nbAddedArmies;
// country->owner(country->automaton()->playerNamed(ownerName));
return stream;
}
......
......@@ -18,7 +18,7 @@
#include "goal.h"
#include "onu.h"
#include <KDebug>
#include "ksirkskineditor_debug.h"
#include <KLocalizedString>
#include <KMessageBox>
......@@ -37,21 +37,21 @@ Goal::Goal() :
Goal::Goal(const Goal& goal)
{
kDebug() << "Goal copy constructor :" << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal copy constructor :" << endl;
m_type = goal.m_type;
kDebug() << " type="<< m_type << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << " type="<< m_type << endl;
m_description = goal.m_description;
kDebug() << " description="<< m_description << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << " description="<< m_description << endl;
m_nbCountries = goal.m_nbCountries;
kDebug() << " nbCountries="<< m_nbCountries << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << " nbCountries="<< m_nbCountries << endl;
m_nbArmiesByCountry = goal.m_nbArmiesByCountry;
kDebug() << " nbArmiesByCountry="<< m_nbArmiesByCountry << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << " nbArmiesByCountry="<< m_nbArmiesByCountry << endl;
m_continents = goal.m_continents;
kDebug() << " continents: "<< m_continents.size() << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << " continents: "<< m_continents.size() << endl;
m_players = goal.m_players;
kDebug() << " players: "<< m_players.size() << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << " players: "<< m_players.size() << endl;
// m_player = goal.m_player;
// kDebug() << " player: "<< m_player << endl;
// qCDebug(KSIRKSKINEDITOR_LOG) << " player: "<< m_player << endl;
}
Goal::~Goal()
......@@ -60,7 +60,7 @@ Goal::~Goal()
QString Goal::message(int displayType) const
{
kDebug();
qCDebug(KSIRKSKINEDITOR_LOG);
KLocalizedString res;
// std::set<unsigned int>::const_iterator it, it_end, it_next;
......@@ -83,7 +83,7 @@ QString Goal::message(int displayType) const
{
res = res.subs(m_player->name());
}*/
kDebug() << "Goal type='" << m_type << "' mes = '" << res.toString() << "'" << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal type='" << m_type << "' mes = '" << res.toString() << "'" << endl;
QList<unsigned int>::const_iterator it, it_end;
switch (m_type)
......@@ -91,7 +91,7 @@ QString Goal::message(int displayType) const
case Goal::GoalPlayer :
if (!m_players.empty())
{
kDebug() << " player name='" << *m_players.begin() << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << " player name='" << *m_players.begin() << endl;
res = res.subs(m_nbCountries);
}
else
......@@ -100,11 +100,11 @@ QString Goal::message(int displayType) const
}
break;
case Goal::Countries:
kDebug() << " arg1 = '" << m_nbCountries << "'" << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << " arg1 = '" << m_nbCountries << "'" << endl;
res=res.subs(m_nbCountries);
if (m_nbArmiesByCountry > 0)
{
kDebug() << " arg2 = '" << m_nbArmiesByCountry << "'" << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << " arg2 = '" << m_nbArmiesByCountry << "'" << endl;
res=res.subs(m_nbArmiesByCountry);
}
break;
......@@ -114,7 +114,7 @@ QString Goal::message(int displayType) const
// {
// if (*it != 0)
// {
/* kDebug() << " arg = '" << m_automaton->game()->theWorld()->continentWithId(*it)->name() << "'" << endl;
/* qCDebug(KSIRKSKINEDITOR_LOG) << " arg = '" << m_automaton->game()->theWorld()->continentWithId(*it)->name() << "'" << endl;
res=res.subs(i18n(m_automaton->game()->theWorld()->continentWithId(*it)->name().toUtf8().data()));*/
// }
// }
......@@ -204,7 +204,7 @@ QString Goal::message(int displayType) const
void Goal::show(int displayType)
{
kDebug() << message(displayType);
qCDebug(KSIRKSKINEDITOR_LOG) << message(displayType);
// m_automaton->game()->showMessage(message(displayType),5, KGameWindow::ForceShowing);
KMessageBox::information(
0,
......@@ -214,49 +214,49 @@ void Goal::show(int displayType)
QDataStream& operator<<(QDataStream& stream, const Goal& goal)
{
kDebug() << "Goal operator<< : type" << goal.type()<< endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator<< : type" << goal.type()<< endl;
stream << quint32(goal.type());
/* if (goal.player() != 0)
{
kDebug() << "Goal operator<< : player " << goal.player()->id() << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator<< : player " << goal.player()->id() << endl;
stream << quint32(goal.player()->id());
}
else
{
kDebug() << "Goal operator<< : player " << 0 << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator<< : player " << 0 << endl;
stream << quint32(0);
}*/
kDebug() << "Goal operator<< : description " << goal.description() << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator<< : description " << goal.description() << endl;
stream << goal.description();
QList<QString>::ConstIterator it, it_end;
QList<unsigned int>::const_iterator itc, itc_end;
switch (goal.type())
{
case Goal::GoalPlayer :
kDebug() << "Goal operator<< : players " << goal.players().size() << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator<< : players " << goal.players().size() << endl;
stream << quint32(goal.players().size());
it = goal.players().constBegin(); it_end = goal.players().constEnd();
for (; it != it_end; it++)
{
kDebug() << "Goal operator<< : player " << (*it) << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator<< : player " << (*it) << endl;
stream << *it;
}
kDebug() << "Goal operator<< : nbCountries " << goal.nbCountries() << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator<< : nbCountries " << goal.nbCountries() << endl;
stream << quint32(goal.nbCountries());
break;
case Goal::Countries:
kDebug() << "Goal operator<< : nbCountries " << goal.nbCountries() << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator<< : nbCountries " << goal.nbCountries() << endl;
stream << quint32(goal.nbCountries());
kDebug() << "Goal operator<< : nbArmiesByCountry " << goal.nbArmiesByCountry() << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator<< : nbArmiesByCountry " << goal.nbArmiesByCountry() << endl;
stream << quint32(goal.nbArmiesByCountry());
break;
case Goal::Continents:
kDebug() << "Goal operator<< : continents " << goal.continents().size() << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator<< : continents " << goal.continents().size() << endl;
stream << quint32(goal.continents().size());
it = goal.continents().begin(); it_end = goal.continents().end();
for (; it != it_end; it++)
{
kDebug() << "Goal operator<< : continent " << (*it) << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator<< : continent " << (*it) << endl;
stream << (*it);
}
break;
......@@ -267,7 +267,7 @@ QDataStream& operator<<(QDataStream& stream, const Goal& goal)
QDataStream& operator>>(QDataStream& stream, Goal& goal)
{
kDebug() << "Goal operator>>" << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator>>" << endl;
quint32 type;
QString description;
QString playerName;
......@@ -275,45 +275,45 @@ QDataStream& operator>>(QDataStream& stream, Goal& goal)
QString id;
quint32 ownerId;
stream >> type;
kDebug() << "Goal operator>> type: " << type << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator>> type: " << type << endl;
stream >> ownerId;
kDebug() << "Goal operator>> ownerId: " << ownerId << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator>> ownerId: " << ownerId << endl;
goal.setType(Goal::GoalType(type));
stream >> description;
kDebug() << "Goal operator>> description: " << description << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator>> description: " << description << endl;
goal.setDescription(description);
switch (type)
{
case Goal::GoalPlayer :
goal.players().clear();
stream >> nbp;
kDebug() << "Goal operator>> nbp: " << nbp << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator>> nbp: " << nbp << endl;
for (quint32 i = 0; i < nbp; i++)
{
stream >> playerName;
kDebug() << "Goal operator>> player name: " << playerName << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator>> player name: " << playerName << endl;
goal.players().push_back(playerName);
}
stream >> nb;
kDebug() << "Goal operator>> nbCountries: " << nb << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator>> nbCountries: " << nb << endl;
goal.setNbCountries(nb);
break;
case Goal::Countries:
stream >> nb;
kDebug() << "Goal operator>> nbCountries: " << nb << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator>> nbCountries: " << nb << endl;
goal.setNbCountries(nb);
stream >> nb;
goal.setNbArmiesByCountry(nb);
kDebug() << "Goal operator>> nbArmiesByCountry: " << nb << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator>> nbArmiesByCountry: " << nb << endl;
break;
case Goal::Continents:
stream >> nb;
kDebug() << "Goal operator>> nbContinents: " << nb << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator>> nbContinents: " << nb << endl;
goal.continents().clear();
for (quint32 i = 0; i < nb; i++)
{
stream >> id;
kDebug() << "Goal operator>> continent: " << id << endl;
qCDebug(KSIRKSKINEDITOR_LOG) << "Goal operator>> continent: " << id << endl;
goal.continents().push_back(id);
}
break;
......
......@@ -26,7 +26,7 @@
#include <kurl.h>
#include <ktabwidget.h>
#include <kedittoolbar.h>
#include <kdebug.h>
#include "ksirkskineditor_debug.h"
#include <QPushButton>
#include <kstandardaction.h>
......@@ -72,7 +72,7 @@ KsirkSkinEditorConfigurationDialog::~KsirkSkinEditorConfigurationDialog ()
void KsirkSkinEditorConfigurationDialog::settingChanged(int)
{
kDebug();
qCDebug(KSIRKSKINEDITOR_LOG);
m_changed = true;
//settingsChangedSlot();
//updateButtons ();
......@@ -80,20 +80,20 @@ void KsirkSkinEditorConfigurationDialog::settingChanged(int)
bool KsirkSkinEditorConfigurationDialog::hasChanged()
{
kDebug();
qCDebug(KSIRKSKINEDITOR_LOG);
return m_changed;
}
void KsirkSkinEditorConfigurationDialog::updateSettings()
{
kDebug();
qCDebug(KSIRKSKINEDITOR_LOG);
m_changed = false;
KsirkSkinEditorSettings::self()->save();
}
void KsirkSkinEditorConfigurationDialog::updateWidgets()
{
kDebug();
qCDebug(KSIRKSKINEDITOR_LOG);
m_changed = false;
}
......
......@@ -43,7 +43,7 @@ The bonus should be proportional to the continent's size and to the difficulty t
</layout>
</item>
<item>
<widget class="KPushButton" name="selectcountriesbutton" >
<widget class="QPushButton" name="selectcountriesbutton" >
<property name="toolTip" >
<string>Select the countries contained in this continent</string>
</property>
......@@ -76,11 +76,6 @@ A list of all the world's countries will be shown and you will be able to select
<extends>QWidget</extends>
<header>knuminput.h</header>
</customwidget>
<customwidget>
<class>KPushButton</class>
<extends>QPushButton</extends>
<header>kpushbutton.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
......
......@@ -330,7 +330,7 @@ This value will be automatically updated if you move the flag by drag and drop.<
</layout>
</item>
<item>
<widget class="KPushButton" name="neighboursbutton" >
<widget class="QPushButton" name="neighboursbutton" >
<property name="toolTip" >
<string>Select this country's neighbors</string>
</property>
......@@ -363,11 +363,6 @@ A list of all the world's countries will be shown and you will be able to select
<extends>QWidget</extends>
<header>knuminput.h</header>
</customwidget>
<customwidget>
<class>KPushButton</class>
<extends>QPushButton</extends>
<header>kpushbutton.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
......
......@@ -195,7 +195,7 @@ in the right dock</string>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8" >
<item>
<widget class="KPushButton" name="newNationalityButton" >
<widget class="QPushButton" name="newNationalityButton" >
<property name="toolTip" >
<string>Creates a new Nationality</string>
</property>
......@@ -221,7 +221,7 @@ in the right dock</string>
</spacer>
</item>
<item>
<widget class="KPushButton" name="deleteNationalityButton" >
<widget class="QPushButton" name="deleteNationalityButton" >
<property name="toolTip" >
<string>Removes the currently selected nationality</string>
</property>
......@@ -259,7 +259,7 @@ During the game, each player must choose a nationality. As such, you should add
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5" >
<item>
<widget class="KPushButton" name="newCountryButton" >