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

List:       kde-commits
Subject:    [libkipi/frameworks] tests: port++
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2014-12-05 13:38:49
Message-ID: E1Xwt5t-00079V-Fy () scm ! kde ! org
[Download RAW message or body]

Git commit 33f69d29a6164d729b4274e8dbea4aa0e3072842 by Gilles Caulier.
Committed on 05/12/2014 at 13:38.
Pushed by cgilles into branch 'frameworks'.

port++

M  +12   -7    tests/common/kipiinterface.cpp
M  +2    -1    tests/common/kipiuploadwidget.cpp
M  +8    -12   tests/kxmlkipicmd/kipitestpluginloader.cpp
M  +7    -3    tests/kxmlkipicmd/main.cpp

http://commits.kde.org/libkipi/33f69d29a6164d729b4274e8dbea4aa0e3072842

diff --git a/tests/common/kipiinterface.cpp b/tests/common/kipiinterface.cpp
index 13374c7..50635d0 100644
--- a/tests/common/kipiinterface.cpp
+++ b/tests/common/kipiinterface.cpp
@@ -34,7 +34,6 @@
 // KDE includes
 
 #include <klocalizedstring.h>
-#include <kdeversion.h>
 #include <kfileitem.h>
 #include <kio/previewjob.h>
 
@@ -76,13 +75,14 @@ ImageCollection KipiInterface::currentAlbum()
         currentAlbumUrl = m_selectedAlbums.at(0);
     }
 
-    return ImageCollection(new KipiImageCollectionShared(currentAlbumUrl));
+    return (ImageCollection(new KipiImageCollectionShared(currentAlbumUrl)));
 }
 
 ImageCollection KipiInterface::currentSelection()
 {
     qDebug() << "Called by plugins";
-    return ImageCollection(new KipiImageCollectionShared(m_selectedImages));
+
+    return (ImageCollection(new KipiImageCollectionShared(m_selectedImages)));
 }
 
 QList<ImageCollection> KipiInterface::allAlbums()
@@ -110,13 +110,14 @@ ImageInfo KipiInterface::info(const QUrl &url)
 {
     qDebug() << QString( "Plugin wants information about image \"%1\"").arg( \
url.url() );  
-    return ImageInfo( new KipiImageInfoShared(this, url ) );
+    return (ImageInfo(new KipiImageInfoShared(this, url)));
 }
 
 bool KipiInterface::addImage(const QUrl &url, QString& errmsg)
 {
     Q_UNUSED(errmsg);
     qDebug() << QString( "Plugin added an image: \"%1\"").arg( url.url() );
+
     return true;
 }
 
@@ -128,6 +129,7 @@ void KipiInterface::delImage(const QUrl &url)
 void KipiInterface::refreshImages(const QList<QUrl>& urls)
 {
     qDebug() << QString( "Plugin asks to refresh %1 images:").arg( urls.size() );
+
     for (QList<QUrl>::ConstIterator it = urls.constBegin(); it!=urls.constEnd(); \
++it)  {
         qDebug() << "  " + (*it).url();
@@ -137,19 +139,22 @@ void KipiInterface::refreshImages(const QList<QUrl>& urls)
 int KipiInterface::features() const
 {
     qDebug() << "Called by plugins";
+
     return ImagesHasTime;
 }
 
 ImageCollectionSelector* KipiInterface::imageCollectionSelector(QWidget* parent)
 {
     qDebug() << "Called by plugins";
-    return new KipiImageCollectionSelector(this, parent);
+
+    return (new KipiImageCollectionSelector(this, parent));
 }
 
 UploadWidget* KipiInterface::uploadWidget(QWidget* parent)
 {
     qDebug() << "Called by plugins";
-    return new KipiUploadWidget(this, parent);
+
+    return (new KipiUploadWidget(this, parent));
 }
 
 void KipiInterface::addSelectedImages(const QList<QUrl>& images)
@@ -212,7 +217,7 @@ void KipiInterface::thumbnails(const QList<QUrl>& list, int)
     {
         KFileItemList items;
         items.append(KFileItem(url));
-        KIO::PreviewJob* job = KIO::filePreview(items, QSize(256, 256));
+        KIO::PreviewJob* const job = KIO::filePreview(items, QSize(256, 256));
 
         connect(job, &KIO::PreviewJob::gotPreview,
                 this, &KipiInterface::slotGotKDEPreview);
diff --git a/tests/common/kipiuploadwidget.cpp b/tests/common/kipiuploadwidget.cpp
index e74230f..878fe7c 100644
--- a/tests/common/kipiuploadwidget.cpp
+++ b/tests/common/kipiuploadwidget.cpp
@@ -89,7 +89,8 @@ ImageCollection KipiUploadWidget::selectedImageCollection() const
         return ImageCollection(0);
     }
 
-    const int row = m_listWidget->row( selectedItems.at(0) );
+    const int row = m_listWidget->row(selectedItems.at(0));
+
     return m_allAlbums.at(row);
 }
 
diff --git a/tests/kxmlkipicmd/kipitestpluginloader.cpp \
b/tests/kxmlkipicmd/kipitestpluginloader.cpp index 5c2379d..5fd93e0 100644
--- a/tests/kxmlkipicmd/kipitestpluginloader.cpp
+++ b/tests/kxmlkipicmd/kipitestpluginloader.cpp
@@ -32,13 +32,9 @@
 
 // KDE includes
 
-#include <kapplication.h>
 #include <kactioncategory.h>
-#include <kactioncollection.h>
-#include <kaction.h>
-#include <kxmlguiclient.h>
 #include <kxmlguifactory.h>
-#include <kglobal.h>
+#include <klocalizedstring.h>
 
 // Local includes
 
@@ -76,7 +72,8 @@ KipiTestPluginLoader* KipiTestPluginLoader::m_instance = 0;
 // -----------------------------------------------
 
 KipiTestPluginLoader::KipiTestPluginLoader(KXmlGuiWindow* const parent, \
                KipiInterface *const interface)
-    : QObject(parent), d(new KipiTestPluginLoaderPriv)
+    : QObject(parent),
+      d(new KipiTestPluginLoaderPriv)
 {
     m_instance       = this;
     d->kipiInterface = interface;
@@ -108,7 +105,7 @@ QList<PluginLoader::Info*> KipiTestPluginLoader::pluginList()
 
 QList<QAction*> KipiTestPluginLoader::kipiActionsByCategory(Category cat) const
 {
-    KActionCategory* category = d->kipiCategoryMap[cat];
+    KActionCategory* const category = d->kipiCategoryMap[cat];
 
     if (category)
     {
@@ -218,7 +215,7 @@ void KipiTestPluginLoader::slotKipiPluginsPlug()
 
     for (PluginLoader::PluginList::ConstIterator it = list.constBegin() ; it != \
list.constEnd() ; ++it)  {
-        Plugin* plugin = (*it)->plugin();
+        Plugin* const plugin = (*it)->plugin();
 
         if (!plugin || !(*it)->shouldLoad())
         {
@@ -238,11 +235,10 @@ void KipiTestPluginLoader::checkEmptyCategory(Category cat)
 
     if (!category)
     {
-//        QAction* action = new QAction(i18n("No tool available"), d->app);
-        QString actionName = "emptyCategory" + categoryShortName(cat);
-        QAction* action = d->app->actionCollection()->addAction(actionName);
+        QString actionName    = "emptyCategory" + categoryShortName(cat);
+        QAction* const action = d->app->actionCollection()->addAction(actionName);
         action->setEnabled(false);
-        category        = new KActionCategory(categoryName(cat), \
d->kipipluginsActionCollection); +        category              = new \
KActionCategory(categoryName(cat), d->kipipluginsActionCollection);  \
d->kipiCategoryMap.insert(cat, category);  }
 }
diff --git a/tests/kxmlkipicmd/main.cpp b/tests/kxmlkipicmd/main.cpp
index 4f29975..fcc32db 100644
--- a/tests/kxmlkipicmd/main.cpp
+++ b/tests/kxmlkipicmd/main.cpp
@@ -82,7 +82,8 @@ int main(int argc, char* argv[])
     QList<QUrl> listSelectedAlbums;
     QList<QUrl> listAllAlbums;
 
-    // determine which with list we start:
+    // Determine which with list we start
+
     QList<QUrl>* startList = 0;
 
     if (args->isSet("selectedimages"))
@@ -101,7 +102,8 @@ int main(int argc, char* argv[])
         startList->append(KCmdLineArgs::makeURL(args->getOption("allalbums").toUtf8()));
  }
 
-    // append the remaining arguments to the lists:
+    // Append the remaining arguments to the lists
+
     for (int i = 0; i < args->count(); ++i)
     {
         const QString argValue = args->arg(i);
@@ -133,7 +135,9 @@ int main(int argc, char* argv[])
     }
 
     KipiTestMainWindow* const mainWindow = new \
                KipiTestMainWindow(listSelectedImages, listSelectedAlbums, \
                listAllAlbums);
-    QObject::connect(mainWindow, &KipiTestMainWindow::destroyed, &app, \
&KApplication::quit); +
+    QObject::connect(mainWindow, &KipiTestMainWindow::destroyed, 
+                     &app, &KApplication::quit);
 
     app.setTopWidget(mainWindow);
 


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