Commit cbefee0d authored by Rafał Malinowski's avatar Rafał Malinowski

core: move Application class to core

Signed-off-by: Rafał Malinowski's avatarRafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
parent 3ebccd2b
......@@ -65,7 +65,6 @@ include_directories ("${CMAKE_CURRENT_BINARY_DIR}")
set (kadu_SRCS
activate.cpp
debug.cpp
kadu-application.cpp
languages-manager.cpp
themes.cpp
updates.cpp
......
......@@ -25,8 +25,8 @@
#include "accounts/accounts-aware-object.h"
#include "buddies/buddy-manager.h"
#include "chat/chat-manager.h"
#include "configuration/configuration.h"
#include "configuration/configuration-api.h"
#include "configuration/configuration.h"
#include "configuration/deprecated-configuration-api.h"
#include "contacts/contact-manager.h"
#include "core/core.h"
......
......@@ -27,6 +27,7 @@
#include "configuration/configuration.h"
#include "configuration/deprecated-configuration-api.h"
#include "contacts/contact-manager.h"
#include "core/application.h"
#include "icons/kadu-icon.h"
#include "identities/identity-manager.h"
#include "identities/identity.h"
......@@ -37,7 +38,6 @@
#include "protocols/protocols-manager.h"
#include "protocols/services/roster/roster-service.h"
#include "status/status-setter.h"
#include "kadu-application.h"
#include "account-shared.h"
......@@ -315,8 +315,8 @@ void AccountShared::setDisconnectStatus()
if (!ProtocolHandler->isConnected() && !ProtocolHandler->isDisconnecting())
return;
bool disconnectWithCurrentDescription = KaduApplication::instance()->configuration()->deprecatedApi()->readBoolEntry("General", "DisconnectWithCurrentDescription");
QString disconnectDescription = KaduApplication::instance()->configuration()->deprecatedApi()->readEntry("General", "DisconnectDescription");
bool disconnectWithCurrentDescription = Application::instance()->configuration()->deprecatedApi()->readBoolEntry("General", "DisconnectWithCurrentDescription");
QString disconnectDescription = Application::instance()->configuration()->deprecatedApi()->readEntry("General", "DisconnectDescription");
Status disconnectStatus;
disconnectStatus.setType(StatusTypeOffline);
......
......@@ -27,8 +27,8 @@
#include "accounts/account-details.h"
#include "accounts/account-manager.h"
#include "buddies/buddy-manager.h"
#include "configuration/configuration.h"
#include "configuration/configuration-api.h"
#include "configuration/configuration.h"
#include "configuration/deprecated-configuration-api.h"
#include "configuration/main-configuration-holder.h"
#include "contacts/contact-details.h"
......
......@@ -2,7 +2,7 @@
#include "activate.h"
#include "kadu-application.h"
#include "core/application.h"
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
......@@ -38,7 +38,7 @@
if( X11_isWindowShaded( QX11Info::display(), window->winId() ) )
X11_shadeWindow( QX11Info::display(), window->winId(), false );
// read user settings
int action = KaduApplication::instance()->configuration()->deprecatedApi()->readNumEntry( "General", "WindowActivationMethod" );
int action = Application::instance()->configuration()->deprecatedApi()->readNumEntry( "General", "WindowActivationMethod" );
// window & desktop
if( X11_getDesktopsCount( QX11Info::display() ) > 1 )
{
......
......@@ -27,9 +27,9 @@
#include "avatars/avatar-manager.h"
#include "buddies/buddy.h"
#include "contacts/contact.h"
#include "core/application.h"
#include "misc/change-notifier.h"
#include "misc/paths-provider.h"
#include "kadu-application.h"
#include "avatar-shared.h"
......@@ -52,7 +52,7 @@ AvatarShared * AvatarShared::loadFromStorage(const std::shared_ptr<StoragePoint>
AvatarShared::AvatarShared(const QUuid &uuid) :
Shared(uuid)
{
AvatarsDir = KaduApplication::instance()->pathsProvider()->profilePath() + QLatin1String("avatars/");
AvatarsDir = Application::instance()->pathsProvider()->profilePath() + QLatin1String("avatars/");
connect(&changeNotifier(), SIGNAL(changed()), this, SIGNAL(updated()));
}
......@@ -143,7 +143,7 @@ void AvatarShared::storeAvatar()
storeValue("LastUpdated", LastUpdated);
storeValue("NextUpdate", NextUpdate);
QDir avatarsDir(KaduApplication::instance()->pathsProvider()->profilePath() + QLatin1String("avatars"));
QDir avatarsDir(Application::instance()->pathsProvider()->profilePath() + QLatin1String("avatars"));
if (!avatarsDir.exists())
avatarsDir.mkpath(QLatin1String("."));
......@@ -173,7 +173,7 @@ void AvatarShared::storeSmallPixmap()
if (!isValidStorage())
return;
QDir avatarsDir(KaduApplication::instance()->pathsProvider()->profilePath() + QLatin1String("avatars"));
QDir avatarsDir(Application::instance()->pathsProvider()->profilePath() + QLatin1String("avatars"));
if (!avatarsDir.exists())
avatarsDir.mkpath(QLatin1String("."));
......
......@@ -24,16 +24,16 @@
#include "accounts/account.h"
#include "buddies/buddy-list.h"
#include "configuration/configuration.h"
#include "configuration/configuration-api.h"
#include "configuration/configuration-manager.h"
#include "configuration/configuration.h"
#include "contacts/contact-manager.h"
#include "contacts/contact.h"
#include "core/application.h"
#include "core/core.h"
#include "protocols/roster.h"
#include "storage/storage-point.h"
#include "debug.h"
#include "kadu-application.h"
#include "buddy-manager.h"
......@@ -63,11 +63,11 @@ void BuddyManager::init()
QMutexLocker locker(&mutex());
int itemsSize = items().size();
QDomElement buddiesNode = KaduApplication::instance()->configuration()->api()->getNode("Buddies", ConfigurationApi::ModeFind);
QDomElement oldContactsNode = KaduApplication::instance()->configuration()->api()->getNode("OldContacts", ConfigurationApi::ModeFind);
QDomElement buddiesNode = Application::instance()->configuration()->api()->getNode("Buddies", ConfigurationApi::ModeFind);
QDomElement oldContactsNode = Application::instance()->configuration()->api()->getNode("OldContacts", ConfigurationApi::ModeFind);
if (oldContactsNode.isNull() && (buddiesNode.isNull() || (itemsSize == 0 && !buddiesNode.hasAttribute("imported"))))
{
importConfiguration(KaduApplication::instance()->configuration()->api());
importConfiguration(Application::instance()->configuration()->api());
buddiesNode.setAttribute("imported", "true");
}
}
......
......@@ -27,8 +27,8 @@
#include "chat/chat.h"
#include "contacts/contact-set.h"
#include "core/core.h"
#include "gui/widgets/chat-widget/chat-widget.h"
#include "gui/widgets/chat-widget/chat-widget-repository.h"
#include "gui/widgets/chat-widget/chat-widget.h"
#include "status/status-container.h"
#include "buddy.h"
......
......@@ -32,8 +32,8 @@
#include "buddies/buddy-manager.h"
#include "buddies/group-manager.h"
#include "buddies/group.h"
#include "configuration/configuration.h"
#include "configuration/configuration-api.h"
#include "configuration/configuration.h"
#include "contacts/contact-manager.h"
#include "contacts/contact.h"
#include "core/core.h"
......
......@@ -27,9 +27,9 @@
#include "avatars/avatar.h"
#include "buddies/buddy-manager.h"
#include "buddies/group.h"
#include "configuration/configuration.h"
#include "configuration/configuration-api.h"
#include "configuration/configuration-manager.h"
#include "configuration/configuration.h"
#include "contacts/contact.h"
#include "core/core.h"
#include "icons/kadu-icon.h"
......
......@@ -26,13 +26,13 @@
#include <QtXml/QDomElement>
#include "buddies/buddy-manager.h"
#include "configuration/configuration.h"
#include "configuration/configuration-api.h"
#include "configuration/configuration.h"
#include "core/application.h"
#include "core/core.h"
#include "gui/windows/message-dialog.h"
#include "storage/storage-point.h"
#include "debug.h"
#include "kadu-application.h"
#include "group-manager.h"
......@@ -89,7 +89,7 @@ void GroupManager::load()
{
QMutexLocker locker(&mutex());
QDomElement groupsNode = KaduApplication::instance()->configuration()->api()->getNode("Groups", ConfigurationApi::ModeFind);
QDomElement groupsNode = Application::instance()->configuration()->api()->getNode("Groups", ConfigurationApi::ModeFind);
if (groupsNode.isNull())
{
importConfiguration();
......
......@@ -22,8 +22,8 @@
#include "buddies/group-manager.h"
#include "configuration/configuration.h"
#include "configuration/deprecated-configuration-api.h"
#include "core/application.h"
#include "misc/change-notifier.h"
#include "kadu-application.h"
#include "group-shared.h"
......@@ -70,7 +70,7 @@ QString GroupShared::storageNodeName()
void GroupShared::importConfiguration(const QString &name)
{
Name = name;
Icon = KaduApplication::instance()->configuration()->deprecatedApi()->readEntry("GroupIcon", name);
Icon = Application::instance()->configuration()->deprecatedApi()->readEntry("GroupIcon", name);
NotifyAboutStatusChanges = true;
ShowInAllGroup= true;
OfflineToGroup= false;
......
......@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "configuration/configuration.h"
#include "configuration/configuration-api.h"
#include "configuration/configuration.h"
#include "configuration/deprecated-configuration-api.h"
#include "storage/storage-point.h"
......
......@@ -31,6 +31,7 @@
#include "configuration/chat-configuration-holder.h"
#include "configuration/configuration.h"
#include "configuration/deprecated-configuration-api.h"
#include "core/application.h"
#include "core/core.h"
#include "formatted-string/formatted-string-factory.h"
#include "gui/widgets/chat-style-preview.h"
......@@ -38,17 +39,16 @@
#include "gui/widgets/configuration/configuration-widget.h"
#include "gui/windows/main-configuration-window.h"
#include "misc/algorithm.h"
#include "misc/paths-provider.h"
#include "misc/memory.h"
#include "kadu-application.h"
#include "misc/paths-provider.h"
#include <QtCore/QCoreApplication>
#include <QtCore/QDir>
#include <QtGui/QPalette>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QLabel>
#include <QtGui/QPalette>
#include <QtWidgets/QPushButton>
static bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
......@@ -119,18 +119,18 @@ void ChatStyleManager::unregisterChatStyleEngine(const QString &name)
void ChatStyleManager::configurationUpdated()
{
if (KaduApplication::instance()->configuration()->deprecatedApi()->readBoolEntry("Chat", "ChatPrune", true))
Prune = KaduApplication::instance()->configuration()->deprecatedApi()->readNumEntry("Chat", "ChatPruneLen");
if (Application::instance()->configuration()->deprecatedApi()->readBoolEntry("Chat", "ChatPrune", true))
Prune = Application::instance()->configuration()->deprecatedApi()->readNumEntry("Chat", "ChatPruneLen");
else
{
KaduApplication::instance()->configuration()->deprecatedApi()->writeEntry("Chat", "ChatPrune", true);
KaduApplication::instance()->configuration()->deprecatedApi()->writeEntry("Chat", "ChatPruneLen", 0);
Application::instance()->configuration()->deprecatedApi()->writeEntry("Chat", "ChatPrune", true);
Application::instance()->configuration()->deprecatedApi()->writeEntry("Chat", "ChatPruneLen", 0);
Prune = 0;
}
ParagraphSeparator = KaduApplication::instance()->configuration()->deprecatedApi()->readNumEntry("Look", "ParagraphSeparator");
ParagraphSeparator = Application::instance()->configuration()->deprecatedApi()->readNumEntry("Look", "ParagraphSeparator");
QFont font = KaduApplication::instance()->configuration()->deprecatedApi()->readFontEntry("Look","ChatFont");
QFont font = Application::instance()->configuration()->deprecatedApi()->readFontEntry("Look","ChatFont");
QString fontFamily = font.family();
QString fontSize;
......@@ -172,13 +172,13 @@ void ChatStyleManager::configurationUpdated()
" padding: 3px;"
"}").arg(fontStyle, fontWeight, fontSize, fontFamily, textDecoration, QString::number(ParagraphSeparator), backgroundColor);
CfgNoHeaderRepeat = KaduApplication::instance()->configuration()->deprecatedApi()->readBoolEntry("Look", "NoHeaderRepeat", true);
CfgNoHeaderRepeat = Application::instance()->configuration()->deprecatedApi()->readBoolEntry("Look", "NoHeaderRepeat", true);
// headers removal stuff
if (CfgNoHeaderRepeat)
{
CfgHeaderSeparatorHeight = KaduApplication::instance()->configuration()->deprecatedApi()->readNumEntry("Look", "HeaderSeparatorHeight");
CfgNoHeaderInterval = KaduApplication::instance()->configuration()->deprecatedApi()->readNumEntry("Look", "NoHeaderInterval");
CfgHeaderSeparatorHeight = Application::instance()->configuration()->deprecatedApi()->readNumEntry("Look", "HeaderSeparatorHeight");
CfgNoHeaderInterval = Application::instance()->configuration()->deprecatedApi()->readNumEntry("Look", "NoHeaderInterval");
}
else
{
......@@ -186,10 +186,10 @@ void ChatStyleManager::configurationUpdated()
CfgNoHeaderInterval = 0;
}
NoServerTime = KaduApplication::instance()->configuration()->deprecatedApi()->readBoolEntry("Look", "NoServerTime");
NoServerTimeDiff = KaduApplication::instance()->configuration()->deprecatedApi()->readNumEntry("Look", "NoServerTimeDiff");
NoServerTime = Application::instance()->configuration()->deprecatedApi()->readBoolEntry("Look", "NoServerTime");
NoServerTimeDiff = Application::instance()->configuration()->deprecatedApi()->readNumEntry("Look", "NoServerTimeDiff");
auto newChatStyle = ChatStyle{KaduApplication::instance()->configuration()->deprecatedApi()->readEntry("Look", "Style"), KaduApplication::instance()->configuration()->deprecatedApi()->readEntry("Look", "ChatStyleVariant")};
auto newChatStyle = ChatStyle{Application::instance()->configuration()->deprecatedApi()->readEntry("Look", "Style"), Application::instance()->configuration()->deprecatedApi()->readEntry("Look", "ChatStyleVariant")};
// if Style was changed, load new Style
if (!CurrentEngine || newChatStyle != m_currentChatStyle)
......@@ -252,7 +252,7 @@ void ChatStyleManager::loadStyles()
QFileInfo fi;
QStringList files;
path = KaduApplication::instance()->pathsProvider()->profilePath() + QLatin1String("syntax/chat/");
path = Application::instance()->pathsProvider()->profilePath() + QLatin1String("syntax/chat/");
dir.setPath(path);
files = dir.entryList();
......@@ -277,7 +277,7 @@ void ChatStyleManager::loadStyles()
}
}
path = KaduApplication::instance()->pathsProvider()->dataPath() + QLatin1String("syntax/chat/");
path = Application::instance()->pathsProvider()->dataPath() + QLatin1String("syntax/chat/");
dir.setPath(path);
files = dir.entryList();
......@@ -357,8 +357,8 @@ void ChatStyleManager::mainConfigurationWindowCreated(MainConfigurationWindow *w
void ChatStyleManager::configurationApplied()
{
KaduApplication::instance()->configuration()->deprecatedApi()->writeEntry("Look", "Style", SyntaxListCombo->currentText());
KaduApplication::instance()->configuration()->deprecatedApi()->writeEntry("Look", "ChatStyleVariant", VariantListCombo->currentText());
Application::instance()->configuration()->deprecatedApi()->writeEntry("Look", "Style", SyntaxListCombo->currentText());
Application::instance()->configuration()->deprecatedApi()->writeEntry("Look", "ChatStyleVariant", VariantListCombo->currentText());
}
void ChatStyleManager::styleChangedSlot(const QString &styleName)
......
......@@ -26,13 +26,13 @@
#include "configuration/configuration-aware-object.h"
#include "os/generic/compositing-aware-object.h"
#include <map>
#include <memory>
#include <QtCore/QMap>
#include <QtCore/QObject>
#include <QtCore/QPointer>
#include <QtCore/QStringList>
#include <QtGui/QColor>
#include <map>
#include <memory>
class ChatStyleEngine;
class ChatStylePreview;
......
......@@ -25,12 +25,12 @@
#include "adium-style-engine.h"
#include "chat-style/chat-style.h"
#include "chat-style/engine/adium/adium-style.h"
#include "chat-style/engine/adium/adium-style-renderer-factory.h"
#include "chat-style/engine/adium/adium-style.h"
#include "core/application.h"
#include "message/message-html-renderer-service.h"
#include "misc/paths-provider.h"
#include "misc/memory.h"
#include "kadu-application.h"
#include "misc/paths-provider.h"
#include <QtCore/QDir>
......@@ -67,9 +67,9 @@ QString AdiumStyleEngine::defaultVariant(const QString &styleName)
QStringList AdiumStyleEngine::styleVariants(QString styleName)
{
QDir dir;
QString styleBaseHref = KaduApplication::instance()->pathsProvider()->profilePath() + QLatin1String("syntax/chat/") + styleName + QLatin1String("/Contents/Resources/Variants/");
QString styleBaseHref = Application::instance()->pathsProvider()->profilePath() + QLatin1String("syntax/chat/") + styleName + QLatin1String("/Contents/Resources/Variants/");
if (!dir.exists(styleBaseHref))
styleBaseHref = KaduApplication::instance()->pathsProvider()->dataPath() + QLatin1String("syntax/chat/") + styleName + QLatin1String("/Contents/Resources/Variants/");
styleBaseHref = Application::instance()->pathsProvider()->dataPath() + QLatin1String("syntax/chat/") + styleName + QLatin1String("/Contents/Resources/Variants/");
dir.setPath(styleBaseHref);
dir.setNameFilters(QStringList("*.css"));
return dir.entryList();
......
......@@ -21,8 +21,8 @@
#include "avatars/avatar.h"
#include "chat-style/chat-style-manager.h"
#include "chat-style/engine/adium/adium-style.h"
#include "chat-style/engine/adium/adium-style-engine.h"
#include "chat-style/engine/adium/adium-style.h"
#include "chat-style/engine/adium/adium-time-formatter.h"
#include "configuration/chat-configuration-holder.h"
#include "contacts/contact-set.h"
......@@ -30,19 +30,19 @@
#include "icons/kadu-icon.h"
#include "identities/identity.h"
#include "message/message-html-renderer-service.h"
#include "message/message-render-info.h"
#include "message/message-render-info-factory.h"
#include "message/message-render-info.h"
#include "misc/date-time.h"
#include "misc/paths-provider.h"
#include "misc/misc.h"
#include "protocols/protocol.h"
#include "misc/paths-provider.h"
#include "protocols/protocol-factory.h"
#include "protocols/protocol.h"
#include "protocols/services/chat-image.h"
#include <QtCore/QFile>
#include <QtGui/QTextDocument>
#include <QtWebKitWidgets/QWebPage>
#include <QtWebKitWidgets/QWebFrame>
#include <QtWebKitWidgets/QWebPage>
AdiumStyleRenderer::AdiumStyleRenderer(ChatStyleRendererConfiguration configuration, std::shared_ptr<AdiumStyle> style, QObject *parent) :
ChatStyleRenderer{std::move(configuration), parent},
......
......@@ -21,8 +21,8 @@
#include "adium-style.h"
#include "core/application.h"
#include "misc/paths-provider.h"
#include "kadu-application.h"
#include <QtCore/QDir>
#include <QtCore/QTextCodec>
......@@ -101,9 +101,9 @@ AdiumStyle::AdiumStyle(const QString &styleName) :
Name{styleName}, StyleViewVersion{0}, DefaultBackgroundIsTransparent{false}, UsesCustomTemplateHtml{false}
{
QDir dir;
BaseHref = KaduApplication::instance()->pathsProvider()->profilePath() + QLatin1String("syntax/chat/") + styleName + QLatin1String("/Contents/Resources/");
BaseHref = Application::instance()->pathsProvider()->profilePath() + QLatin1String("syntax/chat/") + styleName + QLatin1String("/Contents/Resources/");
if (!dir.exists(BaseHref))
BaseHref = KaduApplication::instance()->pathsProvider()->dataPath() + QLatin1String("syntax/chat/") + styleName + QLatin1String("/Contents/Resources/");
BaseHref = Application::instance()->pathsProvider()->dataPath() + QLatin1String("syntax/chat/") + styleName + QLatin1String("/Contents/Resources/");
readConfiugrationFile();
loadHtmlFiles();
......@@ -139,7 +139,7 @@ void AdiumStyle::loadHtmlFiles()
TemplateHref = BaseHref + "template.html";
else
{
TemplateHref = KaduApplication::instance()->pathsProvider()->dataPath() + QLatin1String("syntax/chat/Default/Template.html");
TemplateHref = Application::instance()->pathsProvider()->dataPath() + QLatin1String("syntax/chat/Default/Template.html");
UsesCustomTemplateHtml = false;
}
......
......@@ -22,9 +22,9 @@
#pragma once
#include <memory>
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <memory>
class ChatStyle;
class ChatStyleRendererFactory;
......
......@@ -19,8 +19,8 @@
#pragma once
#include <memory>
#include <QtCore/QObject>
#include <memory>
class ChatStyleRendererFactory;
......
......@@ -24,8 +24,8 @@
#include "chat-style/chat-style.h"
#include "chat-style/engine/chat-style-renderer-factory.h"
#include "chat-style/engine/kadu/kadu-style-renderer-factory.h"
#include "chat-style/engine/kadu/kadu-chat-syntax.h"
#include "chat-style/engine/kadu/kadu-style-renderer-factory.h"
#include "misc/syntax-list.h"
#include <QtCore/QFileInfo>
......
......@@ -19,8 +19,8 @@
#include "kadu-style-renderer.h"
#include "chat-style/engine/kadu/kadu-chat-syntax.h"
#include "chat-style/chat-style-manager.h"
#include "chat-style/engine/kadu/kadu-chat-syntax.h"
#include "contacts/contact-set.h"
#include "message/message-render-info.h"
#include "misc/misc.h"
......
......@@ -34,10 +34,10 @@
#include "configuration/configuration.h"
#include "configuration/deprecated-configuration-api.h"
#include "contacts/contact-set.h"
#include "core/application.h"
#include "misc/change-notifier.h"
#include "parser/parser.h"
#include "debug.h"
#include "kadu-application.h"
#include "chat-shared.h"
......@@ -233,7 +233,7 @@ bool ChatShared::shouldStore()
return false;
// we dont need data for non-roster contacts only from 4 version of sql schema
if (KaduApplication::instance()->configuration()->deprecatedApi()->readNumEntry("History", "Schema", 0) < 4)
if (Application::instance()->configuration()->deprecatedApi()->readNumEntry("History", "Schema", 0) < 4)
return true;
if (customProperties()->shouldStore())
......
......@@ -25,9 +25,9 @@
#include "chat/chat-manager.h"
#include "configuration/configuration.h"
#include "configuration/deprecated-configuration-api.h"
#include "core/application.h"
#include "message/message-manager.h"
#include "message/message.h"
#include "kadu-application.h"
#include "recent-chat-manager.h"
......@@ -142,7 +142,7 @@ void RecentChatManager::store()
for (int i = 0; i < count; i++)
mainElement.removeChild(chatElements.at(i));
if (!KaduApplication::instance()->configuration()->deprecatedApi()->readBoolEntry("Chat", "RecentChatsClear", false))
if (!Application::instance()->configuration()->deprecatedApi()->readBoolEntry("Chat", "RecentChatsClear", false))
foreach (const Chat &chat, RecentChats)
if (chat && !chat.uuid().isNull())
{
......@@ -236,7 +236,7 @@ void RecentChatManager::removeRecentChat(Chat chat)
void RecentChatManager::configurationUpdated()
{
CleanUpTimer.stop();
RecentChatsTimeout = KaduApplication::instance()->configuration()->deprecatedApi()->readNumEntry("Chat", "RecentChatsTimeout") * 60;
RecentChatsTimeout = Application::instance()->configuration()->deprecatedApi()->readNumEntry("Chat", "RecentChatsTimeout") * 60;
if (RecentChatsTimeout > 0)
CleanUpTimer.start();
......
......@@ -22,7 +22,7 @@
#include "configuration/configuration.h"
#include "configuration/deprecated-configuration-api.h"
#include "kadu-application.h"
#include "core/application.h"
#include "chat-configuration-holder.h"
......@@ -59,35 +59,35 @@ void ChatConfigurationHolder::init()
void ChatConfigurationHolder::configurationUpdated()
{
AutoSend = KaduApplication::instance()->configuration()->deprecatedApi()->readBoolEntry("Chat", "AutoSend");
NiceDateFormat = KaduApplication::instance()->configuration()->deprecatedApi()->readBoolEntry("Look", "NiceDateFormat");
ChatTextCustomColors = KaduApplication::instance()->configuration()->deprecatedApi()->readBoolEntry("Look", "ChatTextCustomColors");
ChatTextBgColor = KaduApplication::instance()->configuration()->deprecatedApi()->readColorEntry("Look", "ChatTextBgColor");