Commit 2b639a64 authored by Mathieu Westphal's avatar Mathieu Westphal

Correct style of touched files

parent e64ed5c7
......@@ -29,14 +29,14 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
========================================================================*/
/// This is an auto-generated file. Please do not edit.
// This is an auto-generated file. Please do not edit.
/// This file is used to wrap a ParaView plugin.
// This file is used to wrap a ParaView plugin.
#cmakedefine plugin_type_python
#cmakedefine plugin_type_servermanager
#cmakedefine plugin_type_gui
/// this is set when the plugin has source headers that are wrapped.
// this is set when the plugin has source headers that are wrapped.
#cmakedefine INITIALIZE_WRAPPING
#cmakedefine INITIALIZE_EXTRA_CS_MODULES
......@@ -44,17 +44,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "vtkPVPlugin.h"
#ifdef plugin_type_gui
# include "vtkPVGUIPluginInterface.h"
# include <QObject>
# include <QtPlugin>
#include "vtkPVGUIPluginInterface.h"
#include <QObject>
#include <QtPlugin>
#endif
#ifdef plugin_type_servermanager
# include "vtkPVServerManagerPluginInterface.h"
#include "vtkPVServerManagerPluginInterface.h"
#endif
#ifdef plugin_type_python
# include "vtkPVPythonPluginInterface.h"
#include "vtkPVPythonPluginInterface.h"
#endif
class @PLUGIN_NAME@_Plugin :
......@@ -77,78 +77,77 @@ class @PLUGIN_NAME@_Plugin :
Q_OBJECT
Q_INTERFACES(vtkPVGUIPluginInterface)
Q_PLUGIN_METADATA(IID "com.kitware/paraview/@PLUGIN_NAME@_Plugin")
//#endif
#endif
public:
@PLUGIN_NAME@_Plugin();
// Description:
// Returns the name for this plugin.
const char* GetPluginName() override
{return "@PLUGIN_NAME@"; }
// Description:
// Returns the version for this plugin.
const char* GetPluginVersionString() override
{ return "@PLUGIN_VERSION@"; }
// Description:
// Returns true if this plugin is required on the server.
bool GetRequiredOnServer() override
{ return @PLUGIN_REQUIRED_ON_SERVER@; }
// Description:
// Returns true if this plugin is required on the client.
bool GetRequiredOnClient() override
{ return @PLUGIN_REQUIRED_ON_CLIENT@; }
// Description:
// Returns a ';' separated list of plugin names required by this plugin.
const char* GetRequiredPlugins() override
{
return "@PLUGIN_REQUIRED_PLUGINS@";
}
/**
* Returns the name for this plugin.
*/
const char* GetPluginName() override {return "@PLUGIN_NAME@"; }
/**
* Returns the version for this plugin.
*/
const char* GetPluginVersionString() override { return "@PLUGIN_VERSION@"; }
/**
* Returns true if this plugin is required on the server.
*/
bool GetRequiredOnServer() override { return @PLUGIN_REQUIRED_ON_SERVER@; }
/**
* Returns true if this plugin is required on the client.
*/
bool GetRequiredOnClient() override { return @PLUGIN_REQUIRED_ON_CLIENT@; }
/**
* Returns a ';' separated list of plugin names required by this plugin.
*/
const char* GetRequiredPlugins() override { return "@PLUGIN_REQUIRED_PLUGINS@"; }
/**
* Returns a description of this plugin.
*/
const char* GetDescription() override
{
return "@PLUGIN_DESCRIPTION@";
}
const char* GetDescription() override { return "@PLUGIN_DESCRIPTION@"; }
/**
* Returns EULA for the plugin, if any. If none, this will return nullptr.
*/
const char* GetEULA() override;
// Description:
// Provides access to binary resources compiled into the plugin.
// This is primarily used to compile in icons and compressed help project
// (qch) files into plugins.
/**
* Provides access to binary resources compiled into the plugin.
* This is primarily used to compile in icons and compressed help project
* (qch) files into plugins.
*/
void GetBinaryResources(std::vector<std::string>& resources) override;
#ifdef plugin_type_servermanager
// Description:
// Obtain the server-manager configuration xmls, if any.
void GetXMLs(std::vector<std::string> &xmls) override;
// Description:
// Returns the callback function to call to initialize the interpretor for the
// new vtk/server-manager classes added by this plugin. Returning NULL is
// perfectly valid.
/**
* Obtain the server-manager configuration xmls, if any.
*/
void GetXMLs(std::vector<std::string>& xmls) override;
/**
* Returns the callback function to call to initialize the interpretor for the
* new vtk/server-manager classes added by this plugin. Returning NULL is
* perfectly valid.
*/
vtkClientServerInterpreterInitializer::InterpreterInitializationCallback
GetInitializeInterpreterCallback() override;
#endif
#ifdef plugin_type_gui
/// Returns the list of ParaView-Interfaces provided by this plugin.
/**
* Returns the list of ParaView-Interfaces provided by this plugin.
*/
QObjectList interfaces() override;
#endif
#ifdef plugin_type_python
void GetPythonSourceList(std::vector<std::string>& modules,
std::vector<std::string>& sources,
std::vector<int> &package_flags) override;
std::vector<int>& package_flags) override;
#endif
};
......@@ -101,24 +101,29 @@ public:
return instance;
}
// Description:
// Returns the name for this plugin.
/**
* Returns the name for this plugin.
*/
const char* GetPluginName() override { return this->PluginName.c_str(); }
// Description:
// Returns the version for this plugin.
/**
* Returns the version for this plugin.
*/
const char* GetPluginVersionString() override { return "1.0"; }
// Description:
// Returns true if this plugin is required on the server.
/**
* Returns true if this plugin is required on the server.
*/
bool GetRequiredOnServer() override { return true; }
// Description:
// Returns true if this plugin is required on the client.
/**
* Returns true if this plugin is required on the client.
*/
bool GetRequiredOnClient() override { return false; }
// Description:
// Returns a ';' separated list of plugin names required by this plugin.
/**
* Returns a ';' separated list of plugin names required by this plugin.
*/
const char* GetRequiredPlugins() override { return ""; }
/**
......@@ -126,20 +131,25 @@ public:
*/
const char* GetDescription() override { return ""; }
// Description:
// Obtain the server-manager configuration xmls, if any.
/**
* Obtain the server-manager configuration xmls, if any.
*/
void GetXMLs(std::vector<std::string>& xmls) override { xmls.push_back(this->XML); }
// Description:
// Returns the callback function to call to initialize the interpretor for the
// new vtk/server-manager classes added by this plugin. Returning NULL is
// perfectly valid.
/**
* Returns the callback function to call to initialize the interpretor for the
* new vtk/server-manager classes added by this plugin. Returning NULL is
* perfectly valid.
*/
vtkClientServerInterpreterInitializer::InterpreterInitializationCallback
GetInitializeInterpreterCallback() override
{
return NULL;
}
/**
* Returns EULA for the plugin, if any. If none, this will return nullptr.
*/
const char* GetEULA() override { return nullptr; }
};
......
......@@ -134,7 +134,7 @@ vtkStandardNewMacro(vtkPVPluginsInformation);
vtkPVPluginsInformation::vtkPVPluginsInformation()
{
this->RootOnly = 1;
this->SearchPaths = NULL;
this->SearchPaths = nullptr;
this->Internals = new vtkInternals();
}
......@@ -142,7 +142,7 @@ vtkPVPluginsInformation::vtkPVPluginsInformation()
vtkPVPluginsInformation::~vtkPVPluginsInformation()
{
delete this->Internals;
this->Internals = NULL;
this->Internals = nullptr;
this->SetSearchPaths(0);
}
......@@ -185,7 +185,7 @@ void vtkPVPluginsInformation::CopyToStream(vtkClientServerStream* stream)
void vtkPVPluginsInformation::CopyFromStream(const vtkClientServerStream* stream)
{
int offset = 0;
const char* search_paths = NULL;
const char* search_paths = nullptr;
if (!stream->GetArgument(0, offset++, &search_paths))
{
vtkErrorMacro("Error parsing SearchPaths.");
......@@ -225,7 +225,7 @@ void vtkPVPluginsInformation::CopyFromObject(vtkObject*)
item.AutoLoadForce = false;
vtkPVPlugin* plugin = tracker->GetPlugin(cc);
item.Loaded = plugin != NULL;
item.Loaded = plugin != nullptr;
if (plugin)
{
item.RequiredPlugins = plugin->GetRequiredPlugins();
......@@ -291,7 +291,7 @@ const char* vtkPVPluginsInformation::GetPluginName(unsigned int cc)
{
return (*this->Internals)[cc].Name.c_str();
}
return NULL;
return nullptr;
}
//----------------------------------------------------------------------------
......@@ -300,10 +300,10 @@ const char* vtkPVPluginsInformation::GetPluginStatusMessage(unsigned int cc)
if (cc < this->GetNumberOfPlugins())
{
const char* reply = (*this->Internals)[cc].StatusMessage.c_str();
return (strlen(reply) == 0 ? NULL : reply);
return (strlen(reply) == 0 ? nullptr : reply);
}
return NULL;
return nullptr;
}
//----------------------------------------------------------------------------
......@@ -313,7 +313,7 @@ const char* vtkPVPluginsInformation::GetPluginFileName(unsigned int cc)
{
return (*this->Internals)[cc].FileName.c_str();
}
return NULL;
return nullptr;
}
//----------------------------------------------------------------------------
......@@ -323,7 +323,7 @@ const char* vtkPVPluginsInformation::GetPluginVersion(unsigned int cc)
{
return (*this->Internals)[cc].Version.c_str();
}
return NULL;
return nullptr;
}
//----------------------------------------------------------------------------
......@@ -343,7 +343,7 @@ const char* vtkPVPluginsInformation::GetRequiredPlugins(unsigned int cc)
{
return (*this->Internals)[cc].RequiredPlugins.c_str();
}
return NULL;
return nullptr;
}
//----------------------------------------------------------------------------
......@@ -353,7 +353,7 @@ const char* vtkPVPluginsInformation::GetDescription(unsigned int cc)
{
return (*this->Internals)[cc].Description.c_str();
}
return NULL;
return nullptr;
}
//----------------------------------------------------------------------------
......
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