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

tmp

Signed-off-by: Rafał Malinowski's avatarRafał Malinowski <[email protected]>
parent 2f38991a
......@@ -8,6 +8,7 @@ set (accounts_SRCS
account-storage.cpp
accounts-aware-object.cpp
filter/abstract-account-filter.cpp
filter/have-multilogon-filter.cpp
filter/have-protocol-filter.cpp
filter/protocol-filter.cpp
......@@ -17,18 +18,4 @@ set (accounts_SRCS
model/accounts-proxy-model.cpp
)
set (accounts_MOC_SRCS
account-manager.h
account-shared.h
account-status-container.h
filter/abstract-account-filter.h
filter/have-multilogon-filter.h
filter/protocol-filter.h
filter/writeable-contacts-list-filter.h
model/accounts-model.h
model/accounts-proxy-model.h
)
kadu_subdirectory (accounts "${accounts_SRCS}" "${accounts_MOC_SRCS}" "")
kadu_subdirectory (accounts "${accounts_SRCS}" "" "")
......@@ -40,6 +40,7 @@
#include "windows/kadu-dialog.h"
#include "account-manager.h"
#include "account-manager.moc"
AccountManager::AccountManager(QObject *parent) : Manager<Account>{parent}
{
......@@ -274,5 +275,3 @@ void AccountManager::loaded()
for (auto const &account : items())
account.accountContact().setOwnerBuddy(m_myself->buddy());
}
#include "moc_account-manager.cpp"
......@@ -41,6 +41,7 @@
#include "status/status-setter.h"
#include "account-shared.h"
#include "account-shared.moc"
AccountShared::AccountShared(const QString &protocolName, QObject *parent)
: Shared(QUuid(), parent), ProtocolName(protocolName), ProtocolHandler(0), RememberPassword(false),
......@@ -404,5 +405,3 @@ KaduShared_PropertyPtrReadDef(AccountShared, Identity, accountIdentity, AccountI
{
return account ? account->protocolHandler() : nullptr;
}
#include "moc_account-shared.cpp"
......@@ -26,6 +26,7 @@
#include "protocols/protocol.h"
#include "account-status-container.h"
#include "account-status-container.moc"
AccountStatusContainer::AccountStatusContainer(AccountShared *account)
: StorableStatusContainer(account), Account(account)
......@@ -99,5 +100,3 @@ void AccountStatusContainer::triggerStatusUpdated()
{
emit statusUpdated(this);
}
#include "moc_account-status-container.cpp"
/*
* %kadu copyright begin%
* Copyright 2017 Rafał Przemysław Malinowski ([email protected])
* %kadu copyright end%
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "abstract-account-filter.h"
#include "abstract-account-filter.moc"
......@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef ABSTRACT_ACCOUNT_FILTER
#define ABSTRACT_ACCOUNT_FILTER
#pragma once
#include <QtCore/QObject>
......@@ -38,5 +37,3 @@ public:
signals:
void filterChanged();
};
#endif // ABSTRACT_ACCOUNT_FILTER
......@@ -23,6 +23,7 @@
#include "protocols/protocol-factory.h"
#include "protocol-filter.h"
#include "protocol-filter.moc"
ProtocolFilter::ProtocolFilter(QObject *parent) : AbstractAccountFilter(parent)
{
......@@ -45,5 +46,3 @@ bool ProtocolFilter::acceptAccount(Account account)
{
return (ProtocolName.isEmpty() || ProtocolName == account.protocolName());
}
#include "moc_protocol-filter.cpp"
......@@ -22,6 +22,7 @@
#include "protocols/protocol.h"
#include "writeable-contacts-list-filter.h"
#include "writeable-contacts-list-filter.moc"
WriteableContactsListFilter::WriteableContactsListFilter(QObject *parent) : AbstractAccountFilter(parent)
{
......@@ -39,5 +40,3 @@ bool WriteableContactsListFilter::acceptAccount(Account account)
return !protocol->contactsListReadOnly();
}
#include "moc_writeable-contacts-list-filter.cpp"
......@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef WRITEABLE_CONTACTS_LIST_FILTER_H
#define WRITEABLE_CONTACTS_LIST_FILTER_H
#pragma once
#include "accounts/filter/abstract-account-filter.h"
......@@ -33,5 +32,3 @@ public:
explicit WriteableContactsListFilter(QObject *parent = nullptr);
virtual ~WriteableContactsListFilter();
};
#endif // WRITEABLE_CONTACTS_LIST_FILTER_H
......@@ -31,6 +31,7 @@
#include "protocols/protocol.h"
#include "accounts-model.h"
#include "accounts-model.moc"
AccountsModel::AccountsModel(AccountManager *accountManager, QObject *parent)
: QAbstractListModel{parent}, m_accountManager{accountManager}, m_includeIdInDisplay{}
......@@ -158,5 +159,3 @@ void AccountsModel::setIncludeIdInDisplay(bool includeIdInDisplay)
m_includeIdInDisplay = includeIdInDisplay;
emit dataChanged(index(0, 0), index(rowCount() - 1, 0));
}
#include "moc_accounts-model.cpp"
......@@ -25,6 +25,7 @@
#include "model/roles.h"
#include "accounts-proxy-model.h"
#include "accounts-proxy-model.moc"
AccountsProxyModel::AccountsProxyModel(QObject *parent) : QSortFilterProxyModel(parent)
{
......@@ -96,5 +97,3 @@ void AccountsProxyModel::filterChangedSlot()
invalidateFilter();
emit filterChanged();
}
#include "moc_accounts-proxy-model.cpp"
......@@ -25,19 +25,4 @@ set (buddies_SRCS
model/groups-model.cpp
)
set (buddies_MOC_SRCS
buddy-additional-data-delete-handler-manager.h
buddy-shared.h
buddy-manager.h
group-manager.h
buddy-preferred-manager.h
group-shared.h
model/buddy-list-model.h
model/buddy-manager-adapter.h
# will be used when Qt 4.8 .is required
# model/checkable-buddies-proxy-model.h
model/groups-model.h
)
kadu_subdirectory (buddies "${buddies_SRCS}" "${buddies_MOC_SRCS}" "")
kadu_subdirectory (buddies "${buddies_SRCS}" "" "")
......@@ -21,6 +21,7 @@
#include "buddies/buddy-additional-data-delete-handler.h"
#include "buddy-additional-data-delete-handler-manager.h"
#include "buddy-additional-data-delete-handler-manager.moc"
BuddyAdditionalDataDeleteHandlerManager::BuddyAdditionalDataDeleteHandlerManager(QObject *parent) : QObject(parent)
{
......@@ -52,5 +53,3 @@ void BuddyAdditionalDataDeleteHandlerManager::unregisterAdditionalDataDeleteHand
m_items.removeAll(handler);
emit additionalDataDeleteHandlerUnregistered(handler);
}
#include "moc_buddy-additional-data-delete-handler-manager.cpp"
......@@ -21,6 +21,7 @@
*/
#include "buddy-manager.h"
#include "buddy-manager.moc"
#include "accounts/account.h"
#include "buddies/buddy-list.h"
......@@ -324,5 +325,3 @@ void BuddyManager::buddyContactRemoved(const Contact &contact)
if (!buddy.isNull())
emit buddyContactRemoved(buddy, contact);
}
#include "moc_buddy-manager.cpp"
......@@ -32,6 +32,7 @@
#include "widgets/chat-widget/chat-widget.h"
#include "buddies/buddy-preferred-manager.h"
#include "buddies/buddy-preferred-manager.moc"
BuddyPreferredManager::BuddyPreferredManager(QObject *parent) : QObject{parent}
{
......@@ -193,5 +194,3 @@ Account BuddyPreferredManager::getCommonAccount(const BuddySet &buddies)
return Account::null;
}
#include "moc_buddy-preferred-manager.cpp"
......@@ -22,6 +22,7 @@
*/
#include "buddy-shared.h"
#include "buddy-shared.moc"
#include "accounts/account.h"
#include "avatars/avatars.h"
......@@ -474,5 +475,3 @@ std::shared_ptr<StoragePoint> BuddyShared::createStoragePoint()
else
return Shared::createStoragePoint();
}
#include "moc_buddy-shared.cpp"
......@@ -35,6 +35,7 @@
#include "windows/message-dialog.h"
#include "group-manager.h"
#include "group-manager.moc"
GroupManager::GroupManager(QObject *parent) : Manager<Group>{parent}
{
......@@ -257,5 +258,3 @@ void GroupManager::itemRemoved(Group item)
disconnect(item, 0, this, 0);
emit groupRemoved(item);
}
#include "moc_group-manager.cpp"
......@@ -25,6 +25,7 @@
#include "misc/change-notifier.h"
#include "group-shared.h"
#include "group-shared.moc"
GroupShared::GroupShared(const QUuid &uuid)
: Shared(uuid), NotifyAboutStatusChanges(true), ShowInAllGroup(true), OfflineToGroup(false), ShowIcon(false),
......@@ -122,5 +123,3 @@ void GroupShared::setName(const QString &name)
emit nameChanged();
}
}
#include "moc_group-shared.cpp"
......@@ -37,6 +37,7 @@
#include "buddy-data-extractor.h"
#include "buddy-list-model.h"
#include "buddy-list-model.moc"
#include <QtCore/QMimeData>
......@@ -589,5 +590,3 @@ void BuddyListModel::accountRemoved(Account account)
{
disconnect(account, 0, this, 0);
}
#include "moc_buddy-list-model.cpp"
......@@ -22,6 +22,7 @@
#include "buddies/model/buddy-list-model.h"
#include "buddy-manager-adapter.h"
#include "buddy-manager-adapter.moc"
BuddyManagerAdapter::BuddyManagerAdapter(BuddyListModel *model) : QObject(model), Model(model)
{
......@@ -55,5 +56,3 @@ void BuddyManagerAdapter::buddyRemoved(const Buddy &buddy)
{
Model->removeBuddy(buddy);
}
#include "moc_buddy-manager-adapter.cpp"
......@@ -21,6 +21,7 @@
#include "model/roles.h"
#include "checkable-buddies-proxy-model.h"
#include "checkable-buddies-proxy-model.moc"
CheckableBuddiesProxyModel::CheckableBuddiesProxyModel(QObject *parent) : QIdentityProxyModel(parent)
{
......@@ -90,5 +91,3 @@ BuddySet CheckableBuddiesProxyModel::checkedBuddies() const
{
return CheckedBuddies;
}
#include "moc_checkable-buddies-proxy-model.cpp"
......@@ -21,6 +21,7 @@
*/
#include "groups-model.h"
#include "groups-model.moc"
#include "buddies/group-manager.h"
#include "buddies/group.h"
......@@ -124,5 +125,3 @@ void GroupsModel::groupRemoved(Group group)
endRemoveRows();
}
#include "moc_groups-model.cpp"
......@@ -2,7 +2,4 @@ set (compression_SRCS
archive-extractor.cpp
)
set (compression_MOC_SRCS
)
kadu_subdirectory (compression "${compression_SRCS}" "${compression_MOC_SRCS}" "")
kadu_subdirectory (compression "${compression_SRCS}" "" "")
......@@ -16,13 +16,4 @@ set (contacts_SRCS
model/contact-list-model.cpp
)
set (contacts_MOC_SRCS
contact-manager.h
contact-shared.h
model/buddy-contact-model.h
model/chat-adapter.h
model/contact-list-model.h
)
kadu_subdirectory (contacts "${contacts_SRCS}" "${contacts_MOC_SRCS}" "")
kadu_subdirectory (contacts "${contacts_SRCS}" "" "")
......@@ -22,6 +22,7 @@
*/
#include "contact-manager.h"
#include "contact-manager.moc"
#include "buddies/buddy-manager.h"
#include "buddies/buddy-storage.h"
......@@ -223,5 +224,3 @@ Contact ContactManager::loadStubFromStorage(const std::shared_ptr<StoragePoint>
{
return m_contactStorage->loadStubFromStorage(storagePoint);
}
#include "moc_contact-manager.cpp"
......@@ -35,6 +35,7 @@
#include "roster/roster-entry.h"
#include "contact-shared.h"
#include "contact-shared.moc"
ContactShared::ContactShared(const QUuid &uuid)
: Shared(uuid), Priority(-1), MaximumImageSize(0), UnreadMessagesCount(0), Blocking(false),
......@@ -357,5 +358,3 @@ QString ContactShared::display(bool useBuddyData)
KaduShared_PropertyPtrReadDef(ContactShared, Account, contactAccount, ContactAccount)
KaduShared_PropertyPtrReadDef(ContactShared, Buddy, ownerBuddy, OwnerBuddy)
#include "moc_contact-shared.cpp"
......@@ -32,6 +32,7 @@
#include "protocols/protocol.h"
#include "buddy-contact-model.h"
#include "buddy-contact-model.moc"
BuddyContactModel::BuddyContactModel(Buddy buddy, QObject *parent)
: QAbstractListModel(parent), SourceBuddy(buddy), IncludeIdentityInDisplay(false)
......@@ -150,5 +151,3 @@ void BuddyContactModel::setIncludeIdentityInDisplay(bool includeIdentityInDispla
IncludeIdentityInDisplay = includeIdentityInDisplay;
emit dataChanged(index(0, 0), index(rowCount() - 1, 0));
}
#include "moc_buddy-contact-model.cpp"
......@@ -23,6 +23,7 @@
#include "contacts/model/contact-list-model.h"
#include "chat-adapter.h"
#include "chat-adapter.moc"
ChatAdapter::ChatAdapter(ContactListModel *model, const Chat &chat) : QObject(model), Model(model)
{
......@@ -45,5 +46,3 @@ void ChatAdapter::contactRemoved(const Contact &contact)
{
Model->removeContact(contact);
}
#include "moc_chat-adapter.cpp"
......@@ -11,8 +11,4 @@ set (core_SRCS
version-service.cpp
)
set (core_MOC_SRCS
core.h
)
kadu_subdirectory (core "${core_SRCS}" "${core_MOC_SRCS}" "")
kadu_subdirectory (core "${core_SRCS}" "" "")
......@@ -29,6 +29,7 @@
*/
#include "core.h"
#include "core.moc"
#include "actions/actions.h"
#include "activate.h"
......@@ -558,5 +559,3 @@ void Core::executeRemoteCommand(const QString &remoteCommand)
m_injector.get<ChatWidgetManager>()->openChat(chat, OpenChatActivation::Activate);
}
}
#include "moc_core.cpp"
......@@ -6,17 +6,9 @@ set (gui_SRCS
gui-module.cpp
hot-key.cpp
scoped-updates-disabler.cpp
status-icon.cpp
web-view-highlighter.cpp
)
set (gui_MOC_SRCS
services/clipboard-html-transformer-service.h
hot-key.h
scoped-updates-disabler.cpp
status-icon.h
web-view-highlighter.h
)
kadu_subdirectory (gui "${gui_SRCS}" "${gui_MOC_SRCS}" "")
kadu_subdirectory (gui "${gui_SRCS}" "" "")
......@@ -25,6 +25,7 @@
#include "configuration/configuration.h"
#include "configuration/deprecated-configuration-api.h"
#include "hot-key.h"
#include "hot-key.moc"
QKeySequence HotKey::shortCutFromFile(Configuration *configuration, const QString &groupname, const QString &name)
{
......@@ -102,5 +103,3 @@ void HotKeyEdit::keyReleaseEvent(QKeyEvent *)
if (text().at(text().length() - 1) == '+')
clear();
}
#include "moc_hot-key.cpp"
......@@ -18,6 +18,7 @@
*/
#include "scoped-updates-disabler.h"
#include "scoped-updates-disabler.moc"
#include <QtWidgets/QWidget>
......
......@@ -19,6 +19,7 @@
*/
#include "clipboard-html-transformer-service.h"
#include "clipboard-html-transformer-service.moc"
ClipboardHtmlTransformerService::ClipboardHtmlTransformerService(QObject *parent) : QObject(parent)
{
......@@ -27,5 +28,3 @@ ClipboardHtmlTransformerService::ClipboardHtmlTransformerService(QObject *parent
ClipboardHtmlTransformerService::~ClipboardHtmlTransformerService()
{
}
#include "moc_clipboard-html-transformer-service.cpp"
......@@ -24,6 +24,7 @@
#include "status/status-container.h"
#include "status-icon.h"
#include "status-icon.moc"
StatusIcon::StatusIcon(StatusContainer *statusContainer, QObject *parent)
: QObject(parent), MyStatusContainer(statusContainer), BlinkTimer(0), BlinkOffline(true)
......@@ -102,5 +103,3 @@ void StatusIcon::setIcon(const KaduIcon &icon)
Icon = icon;
emit iconUpdated(Icon);
}
#include "moc_status-icon.cpp"
......@@ -24,6 +24,7 @@
#include "widgets/webkit-messages-view/webkit-messages-view.h"
#include "web-view-highlighter.h"
#include "web-view-highlighter.moc"
WebViewHighlighter::WebViewHighlighter(WebkitMessagesView *parent) : QObject(parent), AutoUpdate(false)
{
......@@ -118,5 +119,3 @@ void WebViewHighlighter::clearSelect()
updateHighlighting();
}
#include "moc_web-view-highlighter.cpp"
......@@ -9,10 +9,4 @@ set (identities_SRCS
identity.cpp
)
set (identities_MOC_SRCS
model/identity-model.h
identity-manager.h
identity-shared.h
)
kadu_subdirectory (identities "${identities_SRCS}" "${identities_MOC_SRCS}" "")
kadu_subdirectory (identities "${identities_SRCS}" "" "")
......@@ -27,6 +27,7 @@
#include "identities/identity-storage.h"
#include "identity-manager.h"
#include "identity-manager.moc"
IdentityManager::IdentityManager(QObject *parent) : Manager<Identity>{parent}
{
......@@ -163,5 +164,3 @@ Identity IdentityManager::loadStubFromStorage(const std::shared_ptr<StoragePoint
{
return m_identityStorage->loadStubFromStorage(storagePoint);
}
#include "moc_identity-manager.cpp"
......@@ -33,6 +33,7 @@
#include "status/status-type.h"
#include "identity-shared.h"
#include "identity-shared.moc"
IdentityShared::IdentityShared(const QUuid &uuid, QObject *parent) : Shared(uuid, parent), Permanent(false)
{
......@@ -156,5 +157,3 @@ StatusContainer *IdentityShared::statusContainer() const
{
return m_identityStatusContainer.get();
}
#include "moc_identity-shared.cpp"
......@@ -20,6 +20,7 @@
*/
#include "identity-model.h"
#include "identity-model.moc"
#include "identities/identity-manager.h"
#include "model/roles.h"
......@@ -132,5 +133,3 @@ void IdentityModel::identityRemoved(Identity identity)
endRemoveRows();
}
#include "moc_identity-model.cpp"
......@@ -10,14 +10,4 @@ set (model_SRCS
model-watcher.cpp
)
set (model_MOC_SRCS
action-filter-proxy-model.h
action-list-model.h
categorized-sort-filter-proxy-model.h
kadu-merged-proxy-model.h
merged-proxy-model.h
model-chain.h
model-watcher.h
)
kadu_subdirectory (model "${model_SRCS}" "${model_MOC_SRCS}" "")
kadu_subdirectory (model "${model_SRCS}" "" "")
......@@ -23,6 +23,7 @@
#include "model/roles.h"
#include "action-filter-proxy-model.h"
#include "action-filter-proxy-model.moc"
ActionFilterProxyModel::ActionFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent), Size(0), Model(0)
{
......@@ -94,5 +95,3 @@ bool ActionFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &
return true;
}
#include "moc_action-filter-proxy-model.cpp"
......@@ -23,6 +23,7 @@
#include "model/roles.h"
#include "action-list-model.h"
#include "action-list-model.moc"
ActionListModel::ActionListModel(QObject *parent) : QAbstractItemModel(parent)
{
......@@ -151,5 +152,3 @@ QModelIndexList ActionListModel::indexListForValue(const QVariant &value) const
return result;
}
#include "moc_action-list-model.cpp"