Explorar o código

Use pass by value for primitive types. Added const where appropriate.

Sascha Zelzer %!s(int64=12) %!d(string=hai) anos
pai
achega
d7125ce87b

+ 12 - 12
Libs/CommandLineModules/Core/ctkCmdLineModuleDefaultPathBuilder.cpp

@@ -32,10 +32,10 @@ public:
   ~ctkCmdLineModuleDefaultPathBuilderPrivate();
   QStringList build() const;
 
-  void setLoadFromHomeDir(const bool& doLoad);
-  void setLoadFromCurrentDir(const bool& doLoad);
-  void setLoadFromApplicationDir(const bool& doLoad);
-  void setLoadFromCtkModuleLoadPath(const bool& doLoad);
+  void setLoadFromHomeDir(bool doLoad);
+  void setLoadFromCurrentDir(bool doLoad);
+  void setLoadFromApplicationDir(bool doLoad);
+  void setLoadFromCtkModuleLoadPath(bool doLoad);
 
   bool LoadFromHomeDir;
   bool LoadFromCurrentDir;
@@ -64,25 +64,25 @@ ctkCmdLineModuleDefaultPathBuilderPrivate::~ctkCmdLineModuleDefaultPathBuilderPr
 }
 
 //-----------------------------------------------------------------------------
-void ctkCmdLineModuleDefaultPathBuilderPrivate::setLoadFromHomeDir(const bool& doLoad)
+void ctkCmdLineModuleDefaultPathBuilderPrivate::setLoadFromHomeDir(bool doLoad)
 {
   LoadFromHomeDir = doLoad;
 }
 
 //-----------------------------------------------------------------------------
-void ctkCmdLineModuleDefaultPathBuilderPrivate::setLoadFromCurrentDir(const bool& doLoad)
+void ctkCmdLineModuleDefaultPathBuilderPrivate::setLoadFromCurrentDir(bool doLoad)
 {
   LoadFromCurrentDir = doLoad;
 }
 
 //-----------------------------------------------------------------------------
-void ctkCmdLineModuleDefaultPathBuilderPrivate::setLoadFromApplicationDir(const bool& doLoad)
+void ctkCmdLineModuleDefaultPathBuilderPrivate::setLoadFromApplicationDir(bool doLoad)
 {
   LoadFromApplicationDir = doLoad;
 }
 
 //-----------------------------------------------------------------------------
-void ctkCmdLineModuleDefaultPathBuilderPrivate::setLoadFromCtkModuleLoadPath(const bool& doLoad)
+void ctkCmdLineModuleDefaultPathBuilderPrivate::setLoadFromCtkModuleLoadPath(bool doLoad)
 {
   LoadFromCtkModuleLoadPath = doLoad;
 }
@@ -156,25 +156,25 @@ QStringList ctkCmdLineModuleDefaultPathBuilder::build() const
 }
 
 //-----------------------------------------------------------------------------
-void ctkCmdLineModuleDefaultPathBuilder::setLoadFromHomeDir(const bool& doLoad)
+void ctkCmdLineModuleDefaultPathBuilder::setLoadFromHomeDir(bool doLoad)
 {
   d->setLoadFromHomeDir(doLoad);
 }
 
 //-----------------------------------------------------------------------------
-void ctkCmdLineModuleDefaultPathBuilder::setLoadFromCurrentDir(const bool& doLoad)
+void ctkCmdLineModuleDefaultPathBuilder::setLoadFromCurrentDir(bool doLoad)
 {
   d->setLoadFromCurrentDir(doLoad);
 }
 
 //-----------------------------------------------------------------------------
-void ctkCmdLineModuleDefaultPathBuilder::setLoadFromApplicationDir(const bool& doLoad)
+void ctkCmdLineModuleDefaultPathBuilder::setLoadFromApplicationDir(bool doLoad)
 {
   d->setLoadFromApplicationDir(doLoad);
 }
 
 //-----------------------------------------------------------------------------
-void ctkCmdLineModuleDefaultPathBuilder::setLoadFromCtkModuleLoadPath(const bool& doLoad)
+void ctkCmdLineModuleDefaultPathBuilder::setLoadFromCtkModuleLoadPath(bool doLoad)
 {
   d->setLoadFromCtkModuleLoadPath(doLoad);
 }

+ 4 - 4
Libs/CommandLineModules/Core/ctkCmdLineModuleDefaultPathBuilder.h

@@ -57,13 +57,13 @@ public:
   ctkCmdLineModuleDefaultPathBuilder();
   ~ctkCmdLineModuleDefaultPathBuilder();
 
-  virtual void setLoadFromHomeDir(const bool& doLoad);
+  virtual void setLoadFromHomeDir(bool doLoad);
 
-  virtual void setLoadFromCurrentDir(const bool& doLoad);
+  virtual void setLoadFromCurrentDir(bool doLoad);
 
-  virtual void setLoadFromApplicationDir(const bool& doLoad);
+  virtual void setLoadFromApplicationDir(bool doLoad);
 
-  virtual void setLoadFromCtkModuleLoadPath(const bool& doLoad);
+  virtual void setLoadFromCtkModuleLoadPath(bool doLoad);
 
   virtual QStringList build() const;
 

+ 9 - 9
Libs/CommandLineModules/Core/ctkCmdLineModuleDirectoryWatcher.cpp

@@ -50,7 +50,7 @@ ctkCmdLineModuleDirectoryWatcher::~ctkCmdLineModuleDirectoryWatcher()
 
 
 //-----------------------------------------------------------------------------
-void ctkCmdLineModuleDirectoryWatcher::setDebug(const bool& debug)
+void ctkCmdLineModuleDirectoryWatcher::setDebug(bool debug)
 {
   d->setDebug(debug);
 }
@@ -64,14 +64,14 @@ void ctkCmdLineModuleDirectoryWatcher::setDirectories(const QStringList& directo
 
 
 //-----------------------------------------------------------------------------
-QStringList ctkCmdLineModuleDirectoryWatcher::directories()
+QStringList ctkCmdLineModuleDirectoryWatcher::directories() const
 {
   return d->directories();
 }
 
 
 //-----------------------------------------------------------------------------
-QStringList ctkCmdLineModuleDirectoryWatcher::files()
+QStringList ctkCmdLineModuleDirectoryWatcher::files() const
 {
   return d->files();
 }
@@ -102,7 +102,7 @@ ctkCmdLineModuleDirectoryWatcherPrivate::~ctkCmdLineModuleDirectoryWatcherPrivat
 
 
 //-----------------------------------------------------------------------------
-void ctkCmdLineModuleDirectoryWatcherPrivate::setDebug(const bool& debug)
+void ctkCmdLineModuleDirectoryWatcherPrivate::setDebug(bool debug)
 {
   this->Debug = debug;
   this->ModuleManager->setVerboseOutput(debug);
@@ -110,14 +110,14 @@ void ctkCmdLineModuleDirectoryWatcherPrivate::setDebug(const bool& debug)
 
 
 //-----------------------------------------------------------------------------
-QStringList ctkCmdLineModuleDirectoryWatcherPrivate::directories()
+QStringList ctkCmdLineModuleDirectoryWatcherPrivate::directories() const
 {
   return this->FileSystemWatcher->directories();
 }
 
 
 //-----------------------------------------------------------------------------
-QStringList ctkCmdLineModuleDirectoryWatcherPrivate::files()
+QStringList ctkCmdLineModuleDirectoryWatcherPrivate::files() const
 {
   return this->FileSystemWatcher->files();
 }
@@ -158,7 +158,7 @@ void ctkCmdLineModuleDirectoryWatcherPrivate::updateWatchedPaths(const QStringLi
 }
 
 //-----------------------------------------------------------------------------
-QStringList ctkCmdLineModuleDirectoryWatcherPrivate::filterInvalidDirectories(const QStringList& directories)
+QStringList ctkCmdLineModuleDirectoryWatcherPrivate::filterInvalidDirectories(const QStringList& directories) const
 {
   QStringList result;
 
@@ -180,7 +180,7 @@ QStringList ctkCmdLineModuleDirectoryWatcherPrivate::filterInvalidDirectories(co
 
 
 //-----------------------------------------------------------------------------
-QStringList ctkCmdLineModuleDirectoryWatcherPrivate::extractCurrentlyWatchedFilenamesInDirectory(const QString& path)
+QStringList ctkCmdLineModuleDirectoryWatcherPrivate::extractCurrentlyWatchedFilenamesInDirectory(const QString& path) const
 {
   QStringList result;
 
@@ -205,7 +205,7 @@ QStringList ctkCmdLineModuleDirectoryWatcherPrivate::extractCurrentlyWatchedFile
 
 
 //-----------------------------------------------------------------------------
-QStringList ctkCmdLineModuleDirectoryWatcherPrivate::getExecutablesInDirectory(const QString& path)
+QStringList ctkCmdLineModuleDirectoryWatcherPrivate::getExecutablesInDirectory(const QString& path) const
 {
   QStringList result;
 

+ 6 - 6
Libs/CommandLineModules/Core/ctkCmdLineModuleDirectoryWatcher.h

@@ -22,11 +22,11 @@
 #define __ctkCmdLineModuleDirectoryWatcher_h
 
 #include <ctkCommandLineModulesCoreExport.h>
+
+#include "ctkCmdLineModuleReference.h"
+
 #include <QObject>
-#include <QHash>
-#include <QStringList>
 #include <QScopedPointer>
-#include "ctkCmdLineModuleReference.h"
 
 class ctkCmdLineModuleManager;
 class ctkCmdLineModuleDirectoryWatcherPrivate;
@@ -54,7 +54,7 @@ public:
    * \brief Set the watcher into debug mode, for more output.
    * \param debug if true, you get more output, otherwise, less output.
    */
-  void setDebug(const bool& debug);
+  void setDebug(bool debug);
 
   /**
    * \brief Set the directories to be watched.
@@ -65,12 +65,12 @@ public:
   /**
    * \brief Returns the list of directories currently being watched.
    */
-  QStringList directories();
+  QStringList directories() const;
 
   /**
    * \brief Returns the list of files (command line apps) currently being watched.
    */
-  QStringList files();
+  QStringList files() const;
 
 private:
 

+ 6 - 6
Libs/CommandLineModules/Core/ctkCmdLineModuleDirectoryWatcherPrivate.h

@@ -50,7 +50,7 @@ public:
   /**
    * \see ctkCmdLineModuleDirectoryWatcher::setDebug
    */
-  void setDebug(const bool& debug);
+  void setDebug(bool debug);
 
   /**
    * \see ctkCmdLineModuleDirectoryWatcher::setDirectories
@@ -60,12 +60,12 @@ public:
   /**
    * \see ctkCmdLineModuleDirectoryWatcher::directories
    */
-  QStringList directories();
+  QStringList directories() const;
 
   /**
    * \see ctkCmdLineModuleDirectoryWatcher::files
    */
-  QStringList files();
+  QStringList files() const;
 
 
 public Q_SLOTS:
@@ -95,21 +95,21 @@ private:
    * \param directories a list of directories, relative or absolute.
    * \return a list of directories, denoted by their absolute path.
    */
-  QStringList filterInvalidDirectories(const QStringList& directories);
+  QStringList filterInvalidDirectories(const QStringList& directories) const;
 
   /**
    * \brief Uses the MapFileNameToReference to work out a list of valid command line modules in a given directory.
    * \param directory the absolute or relative path of a directory.
    * \return a list of executables, denoted by their absolute path.
    */
-  QStringList extractCurrentlyWatchedFilenamesInDirectory(const QString& directory);
+  QStringList extractCurrentlyWatchedFilenamesInDirectory(const QString& directory) const;
 
   /**
    * \brief Returns a list of executable files (not necessarily valid command line clients) in a directory.
    * \param directory A directory
    * \return QStringList a list of absolute path names to executable files
    */
-  QStringList getExecutablesInDirectory(const QString& directory);
+  QStringList getExecutablesInDirectory(const QString& directory) const;
 
   /**
    * \brief Main method to update the current list of watched directories and files.