Compile without foreach

wilder
Laurent Montel 7 years ago
parent 372107d791
commit c55a8c66ba
  1. 5
      CMakeLists.txt
  2. 3
      agents/archivemailagent/archivemailmanager.cpp
  3. 9
      src/editor/kmcomposerwin.cpp
  4. 15
      src/kmkernel.cpp

@ -143,7 +143,10 @@ include_directories(${kmail_SOURCE_DIR} ${kmail_BINARY_DIR})
configure_file(kmail-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kmail-version.h @ONLY) configure_file(kmail-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kmail-version.h @ONLY)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
if (${KF5Config_VERSION} STRGREATER "5.56.0")
add_definitions(-DQT_NO_FOREACH)
MESSAGE(STATUS "compile without foreach")
endif()
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(agents) add_subdirectory(agents)
add_subdirectory(ktnef) add_subdirectory(ktnef)

@ -105,7 +105,8 @@ void ArchiveMailManager::removeCollectionId(Akonadi::Collection::Id id)
group.deleteGroup(); group.deleteGroup();
mConfig->sync(); mConfig->sync();
mConfig->reparseConfiguration(); mConfig->reparseConfiguration();
foreach (ArchiveMailInfo *info, mListArchiveInfo) { //Don't port to for(...:...) const auto lst = mListArchiveInfo;
for (ArchiveMailInfo *info : lst) {
if (info->saveCollectionId() == id) { if (info->saveCollectionId() == id) {
mListArchiveInfo.removeAll(info); mListArchiveInfo.removeAll(info);
} }

@ -1378,7 +1378,8 @@ void KMComposerWin::initializePluginActions()
QHash<QString, QList<QAction *> >::const_iterator i = hashActions.constBegin(); QHash<QString, QList<QAction *> >::const_iterator i = hashActions.constBegin();
while (i != hashActions.constEnd()) { while (i != hashActions.constEnd()) {
Q_FOREACH (KXMLGUIClient *client, guiFactory()->clients()) { const auto lst = guiFactory()->clients();
for (KXMLGUIClient *client : lst) {
client->unplugActionList(i.key()); client->unplugActionList(i.key());
client->plugActionList(i.key(), i.value()); client->plugActionList(i.key(), i.value());
} }
@ -2340,7 +2341,8 @@ void KMComposerWin::setEncryption(bool encrypt, bool setByUser)
if (setByUser) { if (setByUser) {
// User has toggled encryption, go over all recipients // User has toggled encryption, go over all recipients
Q_FOREACH (auto line, mComposerBase->recipientsEditor()->lines()) { const auto lst = mComposerBase->recipientsEditor()->lines();
for (auto line : lst) {
if (encrypt) { if (encrypt) {
// Encryption was enabled, update encryption status of all recipients // Encryption was enabled, update encryption status of all recipients
slotRecipientAdded(qobject_cast<MessageComposer::RecipientLineNG *>(line)); slotRecipientAdded(qobject_cast<MessageComposer::RecipientLineNG *>(line));
@ -3420,7 +3422,8 @@ void KMComposerWin::slotRecipientEditorFocusChanged()
// (unless user enabled it manually), because we want to encrypt by default, // (unless user enabled it manually), because we want to encrypt by default,
// but not by force // but not by force
bool encrypt = false; bool encrypt = false;
Q_FOREACH (auto line_, mComposerBase->recipientsEditor()->lines()) { const auto lst = mComposerBase->recipientsEditor()->lines();
for (auto line_ : lst) {
auto line = qobject_cast<MessageComposer::RecipientLineNG *>(line_); auto line = qobject_cast<MessageComposer::RecipientLineNG *>(line_);
// There's still a lookup job running, so wait, slotKeyForMailBoxResult() // There's still a lookup job running, so wait, slotKeyForMailBoxResult()

@ -536,7 +536,8 @@ void KMKernel::openReader(bool onlyCheck, bool startInTray)
{ {
KMainWindow *ktmw = nullptr; KMainWindow *ktmw = nullptr;
foreach (KMainWindow *window, KMainWindow::memberList()) { const auto lst = KMainWindow::memberList();
for (KMainWindow *window : lst) {
if (::qobject_cast<KMMainWin *>(window)) { if (::qobject_cast<KMMainWin *>(window)) {
ktmw = window; ktmw = window;
break; break;
@ -685,7 +686,8 @@ bool KMKernel::showMail(qint64 serialNumber)
KMMainWidget *mainWidget = nullptr; KMMainWidget *mainWidget = nullptr;
// First look for a KMainWindow. // First look for a KMainWindow.
foreach (KMainWindow *window, KMainWindow::memberList()) { const auto lst = KMainWindow::memberList();
for (KMainWindow *window : lst) {
// Then look for a KMMainWidget. // Then look for a KMMainWidget.
QList<KMMainWidget *> l = window->findChildren<KMMainWidget *>(); QList<KMMainWidget *> l = window->findChildren<KMMainWidget *>();
if (!l.isEmpty() && l.first()) { if (!l.isEmpty() && l.first()) {
@ -1078,7 +1080,8 @@ void KMKernel::setFirstInstance(bool value)
void KMKernel::closeAllKMailWindows() void KMKernel::closeAllKMailWindows()
{ {
foreach (KMainWindow *window, KMainWindow::memberList()) { const auto lst = KMainWindow::memberList();
for (KMainWindow *window : lst) {
if (::qobject_cast<KMMainWin *>(window) if (::qobject_cast<KMMainWin *>(window)
|| ::qobject_cast<KMail::SecondaryWindow *>(window)) { || ::qobject_cast<KMail::SecondaryWindow *>(window)) {
// close and delete the window // close and delete the window
@ -1139,7 +1142,8 @@ void KMKernel::dumpDeadLetters()
} }
// make all composer windows autosave their contents // make all composer windows autosave their contents
foreach (KMainWindow *window, KMainWindow::memberList()) { const auto lst = KMainWindow::memberList();
for (KMainWindow *window : lst) {
if (KMail::Composer *win = ::qobject_cast<KMail::Composer *>(window)) { if (KMail::Composer *win = ::qobject_cast<KMail::Composer *>(window)) {
win->autoSaveMessage(true); win->autoSaveMessage(true);
@ -1274,7 +1278,8 @@ JobScheduler *KMKernel::jobScheduler() const
KMainWindow *KMKernel::mainWin() KMainWindow *KMKernel::mainWin()
{ {
// First look for a KMMainWin. // First look for a KMMainWin.
foreach (KMainWindow *window, KMainWindow::memberList()) { const auto lst = KMainWindow::memberList();
for (KMainWindow *window : lst) {
if (::qobject_cast<KMMainWin *>(window)) { if (::qobject_cast<KMMainWin *>(window)) {
return window; return window;
} }

Loading…
Cancel
Save