Commit 7ea18f17 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Port++

parent f2f14e5a
......@@ -82,7 +82,8 @@ set(ksirk_SRCS
Dialogs/tcpconnectwidget.cpp
main.cpp
decoratedgameframe.cpp
ksirkConfigDialog.cpp
#READD
#ksirkConfigDialog.cpp
fightArena.cpp
mainMenu.cpp
krightdialog.cpp
......@@ -128,7 +129,7 @@ target_link_libraries(ksirk
qca
iris_ksirk
KF5KDEGames
KF5KDEGamesprivate
KF5KDEGamesPrivate
KF5::KDELibs4Support
KF5::Wallet
)
......
......@@ -34,7 +34,7 @@
#include <kdebug.h>
#include <kgamepopupitem.h>
#include <KAction>
#include <KIcon>
#define USE_UNSTABLE_LIBKDEGAMESPRIVATE_API
#include <libkdegamesprivate/kgame/kgameio.h>
#include <libkdegamesprivate/kgame/kplayer.h>
......
......@@ -127,8 +127,8 @@ void KRightDialog::displayCountryDetails(const QPointF& countryPoint)
rightContents.at(4)->setText(i18n("<b>Owner:</b> %1", owner));
rightContents.at(5)->setText(i18n("<b><u>Country details</u></b>"));
flag1->setPixmap(0);
flag2->setPixmap(0);
flag1->setPixmap(QPixmap());
flag2->setPixmap(QPixmap());
flag1->setPixmap(picture);
drap->addWidget(rightContents.at(0));
......@@ -529,7 +529,7 @@ void KRightDialog::clearLabel()
for (int i=0;i<rightContents.size();i++)
{
rightContents.at(i)->setText("");
rightContents.at(i)->setPixmap(0);
rightContents.at(i)->setPixmap(QPixmap());
}
}
......
......@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
{
kDebug() << "Hello World!";
K4AboutData aboutData( "ksirk", 0, ki18n("KsirK"),
KDE_VERSION_STRING, ki18n(description), K4AboutData::License_GPL,
/*KDE_VERSION_STRING*/"5.0.0", ki18n(description), K4AboutData::License_GPL,
ki18n("(c) 2002-2013, Gaël de Chalendar\n"),
ki18n("For help and user manual, please see\nthe KsirK web site."),
"http://games.kde.org/game.php?game=ksirk");
......@@ -55,7 +55,6 @@ int main(int argc, char *argv[])
KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication app;
KGlobal::locale()->insertCatalog( QLatin1String( "libkdegames" ));
if (app.isSessionRestored())
{
......@@ -73,6 +72,5 @@ int main(int argc, char *argv[])
}
kDebug() << "Executing app";
int res = app.exec();
KGlobal::locale()->removeCatalog( "libkdegames" );
return res;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment