Skip to content

Commit

Permalink
Refs #10533 Replace tabs with spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
AntonPiccardoSelg committed Nov 24, 2014
1 parent af7418b commit a2f7d8d
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions Code/Mantid/Framework/Kernel/inc/MantidKernel/ConfigService.h
Expand Up @@ -225,8 +225,8 @@ namespace Mantid
/// Quick check to determine if vates has been installed.
bool quickVatesCheck() const;

/// Get the ParaViewPath
const std::string getParaViewPath() const;
/// Get the ParaViewPath
const std::string getParaViewPath() const;

private:
friend struct Mantid::Kernel::CreateUsingNew<ConfigServiceImpl>;
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/Kernel/src/ConfigService.cpp
Expand Up @@ -1997,7 +1997,7 @@ bool ConfigServiceImpl::quickVatesCheck() const
*/
const std::string ConfigServiceImpl::getParaViewPath() const
{
return getString("paraview.path");
return getString("paraview.path");
}

/// \cond TEMPLATE
Expand Down
Expand Up @@ -100,8 +100,8 @@ using namespace MantidQt::API;

namespace
{
/// Static logger
Kernel::Logger g_log("MdViewerWidget");
/// Static logger
Kernel::Logger g_log("MdViewerWidget");
}

REGISTER_VATESGUI(MdViewerWidget)
Expand Down Expand Up @@ -251,16 +251,16 @@ void MdViewerWidget::createAppCoreForPlugin()
{
if (!pqApplicationCore::instance())
{
// Provide ParaView's application core with a path to ParaView
int argc = 1;
// Provide ParaView's application core with a path to ParaView
int argc = 1;

std::string paraviewPath = Mantid::Kernel::ConfigService::Instance().getParaViewPath();
std::vector<char> argvConversion(paraviewPath.begin(), paraviewPath.end());
argvConversion.push_back('\0');
std::string paraviewPath = Mantid::Kernel::ConfigService::Instance().getParaViewPath();
std::vector<char> argvConversion(paraviewPath.begin(), paraviewPath.end());
argvConversion.push_back('\0');

char *argv[] = {&argvConversion[0]};
char *argv[] = {&argvConversion[0]};

g_log.debug() << "Intialize pqApplicationCore with " << argv << "\n";
g_log.debug() << "Intialize pqApplicationCore with " << argv << "\n";

new pqPVApplicationCore(argc, argv);
}
Expand Down
Expand Up @@ -36,16 +36,16 @@ namespace SimpleGui
{
namespace
{
/// Static logger
Kernel::Logger g_log("ThreeSliceView");
/// Static logger
Kernel::Logger g_log("ThreeSliceView");
}
ThreeSliceView::ThreeSliceView(QWidget *parent) : ViewBase(parent)
{
this->ui.setupUi(this);

// We need to load the QuadView.dll plugin. The Windows system requires the full
// We need to load the QuadView.dll plugin. The Windows system requires the full
// path information. The DLL is located in the apropriate executeable path of paraview.
const Poco::Path paraviewPath(Mantid::Kernel::ConfigService::Instance().getParaViewPath());
const Poco::Path paraviewPath(Mantid::Kernel::ConfigService::Instance().getParaViewPath());

Poco::Path quadViewFullPath(paraviewPath, QUADVIEW_LIBRARY.toStdString());

Expand All @@ -57,7 +57,7 @@ ThreeSliceView::ThreeSliceView(QWidget *parent) : ViewBase(parent)
pm->loadExtension(pqActiveObjects::instance().activeServer(),
quadViewLibrary, &error, false);

g_log.debug() << "Loading QuadView.dll from " << quadViewLibrary.toStdString() << "\n";
g_log.debug() << "Loading QuadView.dll from " << quadViewLibrary.toStdString() << "\n";

this->mainView = this->createRenderView(this->ui.mainRenderFrame,
QString("pqQuadView"));
Expand Down

0 comments on commit a2f7d8d

Please sign in to comment.