Commit 2f10a836 authored by Laurent Montel's avatar Laurent Montel 😁

Astyle kdelibs

parent ebe656c3
......@@ -117,9 +117,9 @@ void TagPropertiesDialog::setupUi()
// not resource context at all, we need to retrieve the IDs the hard way
QSqlQuery query(DbAccess::database());
query.prepare(QStringLiteral("SELECT ResourceTable.name, TagRemoteIdResourceRelationTable.remoteId "
"FROM TagRemoteIdResourceRelationTable "
"LEFT JOIN ResourceTable ON ResourceTable.id = TagRemoteIdResourceRelationTable.resourceId "
"WHERE TagRemoteIdResourceRelationTable.tagid = ?"));
"FROM TagRemoteIdResourceRelationTable "
"LEFT JOIN ResourceTable ON ResourceTable.id = TagRemoteIdResourceRelationTable.resourceId "
"WHERE TagRemoteIdResourceRelationTable.tagid = ?"));
query.addBindValue(mTag.id());
if (query.exec()) {
while (query.next()) {
......
......@@ -20,4 +20,3 @@
#include "grantleethemeeditor_debug.h"
Q_LOGGING_CATEGORY(GRANTLEETHEMEEDITOR_LOG, "log_grantleethemeeditor")
......@@ -486,7 +486,7 @@ void IncidenceAttendee::slotSelectAddresses()
rsvp,
partStat,
KCalCore::Attendee::ReqParticipant
));
));
if (pos < 0) {
pos = dataModel()->rowCount() - 1;
}
......
......@@ -600,7 +600,7 @@ void Command::Private::run()
err = assuan_new(&naked_ctx);
if (err) {
out.errorString = i18n("Could not allocate resources to connect to Kleopatra UI server at %1: %2"
,socketName, to_error_string(err));
, socketName, to_error_string(err));
goto leave;
}
......@@ -631,7 +631,7 @@ void Command::Private::run()
if (err) {
out.errorString = i18n("Could not connect to Kleopatra UI server at %1: %2",
socketName, to_error_string(err));
socketName, to_error_string(err));
goto leave;
}
......@@ -707,8 +707,9 @@ void Command::Private::run()
if (err) {
if (gpg_err_code(err) == GPG_ERR_CANCELED) {
out.canceled = true;
} else
} else {
out.errorString = i18n("Command (%1) failed: %2", QString::fromLatin1(in.command.constData()), to_error_string(err));
}
goto leave;
}
......
......@@ -99,8 +99,9 @@ QString FileDialog::getSaveFileName(QWidget *parent, const QString &caption, con
QString FileDialog::getSaveFileNameEx(QWidget *parent, const QString &caption, const QString &dirID, const QString &proposedFileName, const QString &filter)
{
if (proposedFileName.isEmpty())
if (proposedFileName.isEmpty()) {
return getSaveFileName(parent, caption, dirID, filter);
}
const QString fname = QFileDialog::getSaveFileName(parent, caption, QDir(dir(dirID)).filePath(proposedFileName), filter);
update(fname, dirID);
return fname;
......
......@@ -341,7 +341,7 @@ void KMCommand::slotMsgTransfered(const Akonadi::Item::List &msgs)
#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
mRetrievedMsgs.append(msgs);
#else
Q_FOREACH(const Akonadi::Item &item, msgs) {
Q_FOREACH (const Akonadi::Item &item, msgs) {
mRetrievedMsgs.append(item);
}
#endif
......
......@@ -606,7 +606,7 @@ void KNote::slotUpdateKeepAboveBelow(bool save)
} else if (m_keepBelow->isChecked()) {
attribute->setKeepAbove(false);
attribute->setKeepBelow(true);
KWindowSystem::setState( winId(), state | NET::KeepBelow );
KWindowSystem::setState(winId(), state | NET::KeepBelow);
} else {
attribute->setKeepAbove(false);
attribute->setKeepBelow(false);
......
......@@ -845,7 +845,7 @@ void ActionManager::file_new()
void ActionManager::file_open()
{
const QString defaultPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/korganizer/") ;
const QUrl url = QFileDialog::getOpenFileUrl(dialogParent(), QString(), QUrl::fromLocalFile(defaultPath), QStringLiteral("text/calendar") );
const QUrl url = QFileDialog::getOpenFileUrl(dialogParent(), QString(), QUrl::fromLocalFile(defaultPath), QStringLiteral("text/calendar"));
file_open(url);
}
......@@ -1054,8 +1054,8 @@ void ActionManager::exportHTML(KOrg::HTMLExportSettings *settings, bool autoMode
const QString fileName =
QFileDialog::getSaveFileName(dialogParent(), i18n("Select path for HTML calendar export"),
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),
i18n("HTML Files (*.html)"));
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),
i18n("HTML Files (*.html)"));
settings->setOutputFile(fileName);
settings->save();
}
......
......@@ -20,4 +20,3 @@
#include "korganizer_kontactplugins_specialdates_debug.h"
Q_LOGGING_CATEGORY(KORGANIZER_KONTACTPLUGINS_SPECIALDATES_LOG, "log_korganizer_kontactplugins_specialdates")
......@@ -51,7 +51,6 @@ KOListView::KOListView(const Akonadi::ETMCalendar::Ptr &calendar,
connect(mListView, SIGNAL(showNewEventPopupSignal()),
SLOT(showNewEventPopup()));
connect(mListView, &EventViews::EventView::datesSelected,
this, &KOEventView::datesSelected);
......
......@@ -895,7 +895,7 @@ void LdapSearchDialog::slotUser1()
// set a comment where the contact came from
contact.setNote(i18nc("arguments are host name, datetime",
"Imported from LDAP directory %1 on %2",
items.at(i).second, QLocale().toString(now,QLocale::ShortFormat)));
items.at(i).second, QLocale().toString(now, QLocale::ShortFormat)));
d->mSelectedContacts.append(contact);
}
......
......@@ -146,8 +146,9 @@ void ManageSieveWidget::slotContextMenuRequested(const QPoint &p)
menu.addAction(KStandardGuiItem::cancel().text(), this, SLOT(slotCancelFetch()));
}
}
if ( !menu.actions().isEmpty() )
menu.exec( mTreeView->viewport()->mapToGlobal(p) );
if (!menu.actions().isEmpty()) {
menu.exec(mTreeView->viewport()->mapToGlobal(p));
}
}
void ManageSieveWidget::slotCancelFetch()
......
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