Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 7bdb89f3 authored by Laurent Montel's avatar Laurent Montel 😁

kdelibs4support--

parent ce401c7a
......@@ -126,7 +126,7 @@ void KsirkJabberGameWidget::slotJabberConnectButtonClicked()
delete wallet;
}
KsirkSettings::self()->writeConfig();
KsirkSettings::self()->save();
m_automaton->game()->jabberClient()->setOverrideHost ( true, jid.domain(), 5222 );
JabberClient::ErrorCode res = m_automaton->game()->jabberClient()->connect(jid, pass);
......@@ -228,7 +228,7 @@ void KsirkJabberGameWidget::slotJoinRoom()
}
delete wallet;
}
KsirkSettings::self()->writeConfig();
KsirkSettings::self()->save();
if (groupchatPassword.isEmpty())
......
......@@ -304,7 +304,7 @@ void JabberAccount::connectWithPassword ( const QString &password )
m_jabberClient->setAllowPlainTextPassword ( false );
// enable file transfer (if empty, IP will be set after connection has been established)
// KConfigGroup config = KGlobal::config()->group ( "Jabber" );
// KConfigGroup config = KSharedConfig::openConfig()->group ( "Jabber" );
// m_jabberClient->setFileTransfersEnabled ( true, config.readEntry ( "LocalIP" ) );
// setS5BServerPort ( config.readEntry ( "LocalPort", 8010 ) );
......
......@@ -273,7 +273,7 @@ void JabberBaseContact::updateResourceList ()
// resource timestamp
resourceListStr += QString ( "<tr><td>%1: %2</td></tr>" ).
arg ( i18n ( "Timestamp" ), KGlobal::locale()->formatDateTime ( (*it)->resource().status().timeStamp(), KLocale::ShortDate, true ) );
arg ( i18n ( "Timestamp" ), KLocale::global()->formatDateTime ( (*it)->resource().status().timeStamp(), KLocale::ShortDate, true ) );
// message, if any
if ( !(*it)->resource().status().status().trimmed().isEmpty () )
......
......@@ -280,7 +280,7 @@ void JabberContact::handleIncomingMessage (const XMPP::Message & message)
{
QString room=message.invite();
QString originalBody=message.body().isEmpty() ? QString() :
i18n( "The original message is: <i>\" %1 \"</i><br />" , Qt::escape(message.body()));
i18n( "The original message is: <i>\" %1 \"</i><br />" , message.body().toHtmlEscaped());
QString mes=i18n("<qt><i>%1</i> has invited you to join the conference <b>%2</b><br />%3<br />"
"If you want to accept and join, just <b>enter your nickname</b> and press ok<br />"
"If you want to decline, press cancel</qt>",
......
......@@ -1090,7 +1090,7 @@ bool KGameWindow::queryClose()
delete m_automaton->playerList()->takeFirst();
}
delete m_automaton; m_automaton = 0;*/
KGlobal::config()->sync();
KSharedConfig::openConfig()->sync();
return true;
}
......
......@@ -93,7 +93,7 @@ void KsirkConfigurationDialog::updateSettings()
KsirkSettings::setSoundEnabled(m_widget->soundEnabled->isChecked());
KsirkSettings::setHelpEnabled(m_widget->helpEnabled->isChecked());
KsirkSettings::setShowArmiesNumbers(m_widget->armiesNumbers->isChecked());
KsirkSettings::self()->writeConfig();
KsirkSettings::self()->save();
}
void KsirkConfigurationDialog::updateWidgets()
......
......@@ -88,7 +88,7 @@ void KsirkSkinEditorConfigurationDialog::updateSettings()
{
kDebug();
m_changed = false;
KsirkSkinEditorSettings::self()->writeConfig();
KsirkSkinEditorSettings::self()->save();
}
void KsirkSkinEditorConfigurationDialog::updateWidgets()
......
......@@ -58,7 +58,8 @@ int main(int argc, char *argv[])
KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication app;
KGlobal::locale()->insertCatalog( QLatin1String( "libkdegames" ));
//KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
//KLocale::global()->insertCatalog( QLatin1String( "libkdegames" ));
if (app.isSessionRestored())
{
RESTORE(KsirkSkinEditor::MainWindow);
......
......@@ -317,11 +317,11 @@ MainWindow::~MainWindow()
{
kDebug();
m_dirs = 0;
KSharedConfig::Ptr config = KGlobal::config();
KSharedConfig::Ptr config = KSharedConfig::openConfig();
if (m_rfa != 0)
{
kDebug() << "saving recent files";
m_rfa->saveEntries(KGlobal::config()->group("ksirkskineditor"));
m_rfa->saveEntries(KSharedConfig::openConfig()->group("ksirkskineditor"));
}
}
......@@ -338,9 +338,9 @@ void MainWindow::initActions()
m_rfa->setText(i18n("Load &Recent"));
m_rfa->setToolTip(i18n("Open a recently saved skin..."));
KSharedConfig::Ptr config = KGlobal::config();
KSharedConfig::Ptr config = KSharedConfig::openConfig();
kDebug() << "loading recent files";
m_rfa->loadEntries(KGlobal::config()->group("ksirkskineditor"));
m_rfa->loadEntries(KSharedConfig::openConfig()->group("ksirkskineditor"));
m_saveGameAction = KStandardGameAction::save(this, SLOT(slotSaveSkin()), this);
actionCollection()->addAction(m_saveGameAction->objectName(), m_saveGameAction);
......@@ -384,7 +384,7 @@ void MainWindow::slotOpenSkin(const QString& dir)
if (m_rfa != 0)
{
kDebug() << "Adding" << skinDir << "to recent files";
m_rfa->addUrl(KUrl::fromPath(skinDir));
m_rfa->addUrl(QUrl::fromLocalFile(skinDir));
}
m_mapScene->clear();
......@@ -552,7 +552,7 @@ bool MainWindow::queryClose()
return false;
}
}
KGlobal::config()->sync();
KSharedConfig::openConfig()->sync();
return true;
}
......
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