Commit 6b337e54 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Make it compile with -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII

parent c78d45a3
......@@ -33,6 +33,7 @@ include(ECMAddTests)
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
add_definitions(-DTRANSLATION_DOMAIN="ksquares")
add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
add_subdirectory(src)
......
......@@ -312,15 +312,15 @@ void KSquaresWindow::setupActions()
void KSquaresWindow::optionsPreferences()
{
KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self());
KConfigDialog *dialog = new KConfigDialog(this, QLatin1Literal("settings"), Settings::self());
QWidget *displaySettingsDialog = new QWidget;
ui_prefs_display.setupUi(displaySettingsDialog);
dialog->addPage(displaySettingsDialog, i18n("Display"), "preferences-desktop-display");
dialog->addPage(displaySettingsDialog, i18n("Display"), QLatin1Literal("preferences-desktop-display"));
QWidget *aiSettingsDialog = new QWidget;
ui_prefs_ai.setupUi(aiSettingsDialog);
dialog->addPage(aiSettingsDialog, i18n("Computer Player"), "games-difficult");
dialog->addPage(aiSettingsDialog, i18n("Computer Player"), QLatin1Literal("games-difficult"));
connect(dialog, &KConfigDialog::settingsChanged, m_view, &GameBoardView::setBoardSize);
dialog->show();
......
......@@ -36,10 +36,10 @@ int main(int argc, char **argv)
migrate.setUiFiles(QStringList() << QLatin1String("ksquaresui.rc"));
migrate.migrate();
KAboutData about("ksquares", i18n("KSquares"), version, i18n(description),
KAboutData about(QLatin1Literal("ksquares"), i18n("KSquares"), QLatin1Literal(version), i18n(description),
KAboutLicense::GPL, i18n("(C) 2006-2007 Matt Williams"),
"http://games.kde.org/ksquares");
about.addAuthor( i18n("Matt Williams"), i18n("Original creator and maintainer"), "matt@milliams.com", "http://milliams.com" );
QLatin1Literal("http://games.kde.org/ksquares"));
about.addAuthor( i18n("Matt Williams"), i18n("Original creator and maintainer"), QLatin1Literal("matt@milliams.com"), QLatin1Literal("http://milliams.com") );
about.addCredit(i18n("Fela Winkelmolen"), i18n("Many patches and bugfixes"));
about.addCredit(i18n("Tom Vincent Peters"), i18n("Hard AI"));
......@@ -66,7 +66,7 @@ int main(int argc, char **argv)
cg.writeEntry("initializeNames", false);
}
if (parser.isSet("demo"))
if (parser.isSet(QLatin1Literal("demo")))
{
KSquaresDemoWindow *demoWindow = new KSquaresDemoWindow;
demoWindow->show();
......
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