[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim-runtime] resources/kalarm: Formatting
From:       David Jarvie <djarvie () kde ! org>
Date:       2016-12-10 13:54:04
Message-ID: E1cFi6G-00034J-Bs () code ! kde ! org
[Download RAW message or body]

Git commit d66f05a581050a707663dbd5ecb4daf7305a543d by David Jarvie.
Committed on 10/12/2016 at 13:49.
Pushed by djarvie into branch 'master'.

Formatting

M  +3    -3    resources/kalarm/kalarm/kalarmresource.cpp
M  +5    -5    resources/kalarm/kalarmdir/kalarmdirresource.cpp

https://commits.kde.org/kdepim-runtime/d66f05a581050a707663dbd5ecb4daf7305a543d

diff --git a/resources/kalarm/kalarm/kalarmresource.cpp \
b/resources/kalarm/kalarm/kalarmresource.cpp index d901e86fe..3c34db382 100644
--- a/resources/kalarm/kalarm/kalarmresource.cpp
+++ b/resources/kalarm/kalarm/kalarmresource.cpp
@@ -197,7 +197,7 @@ bool KAlarmResource::readFromFile(const QString &fileName)
 void KAlarmResource::checkFileCompatibility(const Collection &collection, bool \
createAttribute)  {
     if (collection.isValid()
-            &&  collection.hasAttribute<CompatibilityAttribute>()) {
+    &&  collection.hasAttribute<CompatibilityAttribute>()) {
         // Update our note of the calendar version and compatibility
         const CompatibilityAttribute *attr = \
collection.attribute<CompatibilityAttribute>();  mCompatibility = \
attr->compatibility(); @@ -205,8 +205,8 @@ void \
KAlarmResource::checkFileCompatibility(const Collection &collection, bool c  \
createAttribute = false;  }
     if (mHaveReadFile
-            && (createAttribute
-                ||  mFileCompatibility != mCompatibility  ||  mFileVersion != \
mVersion)) { +    && (createAttribute
+        ||  mFileCompatibility != mCompatibility  ||  mFileVersion != mVersion)) {
         // The actual file's version and compatibility are different from
         // those in the Akonadi database, so update the database attributes.
         mCompatibility = mFileCompatibility;
diff --git a/resources/kalarm/kalarmdir/kalarmdirresource.cpp \
b/resources/kalarm/kalarmdir/kalarmdirresource.cpp index e0f85852b..228c94b1c 100644
--- a/resources/kalarm/kalarmdir/kalarmdirresource.cpp
+++ b/resources/kalarm/kalarmdir/kalarmdirresource.cpp
@@ -138,7 +138,7 @@ void KAlarmDirResource::collectionFetchResult(KJob *j)
                     const QString rid = c.remoteId();
                     const QUrl url = QUrl::fromLocalFile(mSettings->path());
                     if (!url.isLocalFile()
-                            || (rid != url.toLocalFile() && rid != url.url() && rid \
!= url.toDisplayString())) { +                    || (rid != url.toLocalFile() && rid \
                != url.url() && rid != url.toDisplayString())) {
                         qCritical() << "Collection remote ID does not match \
settings: changing settings";  recreate = true;
                     }
@@ -212,7 +212,7 @@ void KAlarmDirResource::configure(WId windowId)
                 modify = true;
             }
             if (mSettings->readOnly() != readOnly
-                    ||  mSettings->displayName() != name) {
+            ||  mSettings->displayName() != name) {
                 // Need to change the collection's rights or name
                 c.setRemoteId(directoryName());
                 setNameRights(c);
@@ -1165,9 +1165,9 @@ QString KAlarmDirResource::removeEventFile(const QString \
&eventId, const QString  bool KAlarmDirResource::isFileValid(const QString &file) \
const  {
     return !file.isEmpty()
-           &&  !file.startsWith(QLatin1Char('.'))  &&  \
                !file.endsWith(QLatin1Char('~'))
-           &&  file != QLatin1String(warningFile)
-           &&  QFile(filePath(file)).exists();   // a temporary file may no longer \
exist +       &&  !file.startsWith(QLatin1Char('.'))  &&  \
!file.endsWith(QLatin1Char('~')) +       &&  file != QLatin1String(warningFile)
+       &&  QFile(filePath(file)).exists();   // a temporary file may no longer exist
 }
 
 AKONADI_RESOURCE_MAIN(KAlarmDirResource)


[prev in list] [next in list] [prev in thread] [next in thread]