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 7c67a52b authored by Laurent Montel's avatar Laurent Montel 😁

Rename some "Baloo" variables

parent f94304e9
......@@ -129,11 +129,11 @@ KMKernel::KMKernel(QObject *parent)
, mMailService(nullptr)
, mSystemNetworkStatus(true)
, mSystemTray(nullptr)
, mDebugBaloo(false)
, mDebugAkonadiSearch(false)
{
//Initialize kmail sieveimap interface
KSieveUi::SieveImapInstanceInterfaceManager::self()->setSieveImapInstanceInterface(new KMailSieveImapInstanceInterface);
mDebugBaloo = !qEnvironmentVariableIsEmpty("KDEPIM_BALOO_DEBUG");
mDebugAkonadiSearch = !qEnvironmentVariableIsEmpty("AKONADI_SEARCH_DEBUG");
mSystemNetworkStatus = PimCommon::NetworkManager::self()->networkConfigureManager()->isOnline();
......@@ -1920,9 +1920,9 @@ FolderArchiveManager *KMKernel::folderArchiveManager() const
return mFolderArchiveManager;
}
bool KMKernel::allowToDebugBalooSupport() const
bool KMKernel::allowToDebugAkonadiSeachSupport() const
{
return mDebugBaloo;
return mDebugAkonadiSearch;
}
bool KMKernel::firstStart() const
......
......@@ -418,7 +418,7 @@ public:
void toggleSystemTray();
FolderArchiveManager *folderArchiveManager() const;
bool allowToDebugBalooSupport() const;
bool allowToDebugAkonadiSeachSupport() const;
Akonadi::Search::PIM::IndexedItems *indexedItems() const;
......@@ -538,7 +538,7 @@ private:
CheckIndexingManager *mCheckIndexingManager = nullptr;
Akonadi::Search::PIM::IndexedItems *mIndexedItems = nullptr;
MailCommon::MailCommonSettings *mMailCommonSettings = nullptr;
bool mDebugBaloo = false;
bool mDebugAkonadiSearch = false;
};
#endif // _KMKERNEL_H
......@@ -2761,9 +2761,9 @@ void KMMainWidget::showMessagePopup(const Akonadi::Item &msg, const QUrl &url, c
menu.addSeparator();
menu.addAction(mMsgActions->addFollowupReminderAction());
if (kmkernel->allowToDebugBalooSupport()) {
if (kmkernel->allowToDebugAkonadiSeachSupport()) {
menu.addSeparator();
menu.addAction(mMsgActions->debugBalooAction());
menu.addAction(mMsgActions->debugAkonadiSearchAction());
}
}
if (!selectedText.isEmpty()) {
......
......@@ -612,9 +612,9 @@ void KMReaderMainWin::showMessagePopup(const Akonadi::Item &msg, const QUrl &url
menu->addSeparator();
menu->addAction(mMsgActions->addFollowupReminderAction());
}
if (kmkernel->allowToDebugBalooSupport()) {
if (kmkernel->allowToDebugAkonadiSeachSupport()) {
menu->addSeparator();
menu->addAction(mMsgActions->debugBalooAction());
menu->addAction(mMsgActions->debugAkonadiSearchAction());
}
}
if (!selectedText.isEmpty()) {
......
......@@ -186,9 +186,9 @@ MessageActions::MessageActions(KActionCollection *ac, QWidget *parent)
replyMenu()->addAction(mCustomTemplatesMenu->replyActionMenu());
replyMenu()->addAction(mCustomTemplatesMenu->replyAllActionMenu());
//Don't translate it. Shown only when we set env variable KDEPIM_BALOO_DEBUG
mDebugBalooAction = new QAction(QStringLiteral("Debug Baloo..."), this);
connect(mDebugBalooAction, &QAction::triggered, this, &MessageActions::slotDebugBaloo);
//Don't translate it. Shown only when we set env variable AKONADI_SEARCH_DEBUG
mDebugAkonadiSearchAction = new QAction(QStringLiteral("Debug Akonadi Search..."), this);
connect(mDebugAkonadiSearchAction, &QAction::triggered, this, &MessageActions::slotDebugAkonadiSearch);
mAddFollowupReminderAction = new QAction(i18n("Add Followup Reminder..."), this);
ac->addAction(QStringLiteral("message_followup_reminder"), mAddFollowupReminderAction);
......@@ -672,9 +672,9 @@ void MessageActions::addWebShortcutsMenu(QMenu *menu, const QString &text)
mWebShortcutMenuManager->addWebShortcutsToMenu(menu);
}
QAction *MessageActions::debugBalooAction() const
QAction *MessageActions::debugAkonadiSearchAction() const
{
return mDebugBalooAction;
return mDebugAkonadiSearchAction;
}
QAction *MessageActions::addFollowupReminderAction() const
......@@ -682,7 +682,7 @@ QAction *MessageActions::addFollowupReminderAction() const
return mAddFollowupReminderAction;
}
void MessageActions::slotDebugBaloo()
void MessageActions::slotDebugAkonadiSearch()
{
if (!mCurrentItem.isValid()) {
return;
......
......@@ -91,7 +91,7 @@ public:
void addWebShortcutsMenu(QMenu *menu, const QString &text);
QAction *debugBalooAction() const;
QAction *debugAkonadiSearchAction() const;
QAction *addFollowupReminderAction() const;
Q_SIGNALS:
......@@ -129,7 +129,7 @@ private Q_SLOTS:
void slotUpdateActionsFetchDone(KJob *job);
void slotMailingListFilter();
void slotDebugBaloo();
void slotDebugAkonadiSearch();
void slotAddFollowupReminder();
private:
......@@ -158,7 +158,7 @@ private:
TemplateParser::CustomTemplatesMenu *mCustomTemplatesMenu = nullptr;
QAction *mListFilterAction = nullptr;
QAction *mAddFollowupReminderAction = nullptr;
QAction *mDebugBalooAction = nullptr;
QAction *mDebugAkonadiSearchAction = nullptr;
KIO::KUriFilterSearchProviderActions *mWebShortcutMenuManager = nullptr;
};
}
......
......@@ -98,10 +98,10 @@ void CheckIndexingManager::callToReindexCollection()
if (Akonadi::ServerManager::hasInstanceIdentifier()) {
service += QLatin1Char('.') + Akonadi::ServerManager::instanceIdentifier();
}
QDBusInterface interfaceBalooIndexer(PimCommon::MailUtil::indexerServiceName(), QStringLiteral("/"), service);
if (interfaceBalooIndexer.isValid()) {
QDBusInterface interfaceAkonadiIndexer(PimCommon::MailUtil::indexerServiceName(), QStringLiteral("/"), service);
if (interfaceAkonadiIndexer.isValid()) {
qCDebug(KMAIL_LOG) << "Reindex collections :" << mCollectionsIndexed;
interfaceBalooIndexer.asyncCall(QStringLiteral("reindexCollections"), QVariant::fromValue(mCollectionsNeedToBeReIndexed));
interfaceAkonadiIndexer.asyncCall(QStringLiteral("reindexCollections"), QVariant::fromValue(mCollectionsNeedToBeReIndexed));
}
}
}
......
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