Commit f33a8f58 authored by Marcus D. Hanwell's avatar Marcus D. Hanwell Committed by Code Review
Browse files

Merge topic 'fix-configured-headers' into master

edffc381 The Qt string rendering is not really needed
d8f98c51 Removed MySQL, PostgreSQL ifdefs
2cad2031 Removed Boost, R, QT and N-Way from vtkConfigure.h
parents 72f2799d edffc381
......@@ -139,18 +139,6 @@
# define MAC_OSX_TK
#endif
/* Whether the Boost library is being used */
#cmakedefine VTK_USE_BOOST
/* Whether Gnu R can be used */
#cmakedefine VTK_USE_GNU_R
/* Whether the Qt files are available */
#cmakedefine VTK_USE_QT
/* Whether N-way arrays are being used */
#cmakedefine VTK_USE_N_WAY_ARRAYS
/*--------------------------------------------------------------------------*/
/* VTK Versioning */
......@@ -217,8 +205,4 @@
# endif
#endif
/* Set the whether we have UINTPTR_T defined in support of the GNU R interface */
#cmakedefine HAVE_VTK_UINTPTR_T
#define VTK_R_HOME "@VTK_R_HOME@"
#endif
......@@ -39,34 +39,6 @@
/* Whether we are building MPI support. */
#cmakedefine VTK_USE_MPI
/* Should VTK use PostgreSQL? */
#cmakedefine VTK_USE_POSTGRES
/* Should VTK use MySQL? */
#cmakedefine VTK_USE_MYSQL
/* Should VTK use ODBC? */
#cmakedefine VTK_USE_ODBC
#cmakedefine VTK_ODBC_TEST_DSN
#ifdef VTK_ODBC_TEST_DSN
# undef VTK_ODBC_TEST_DSN
# define VTK_ODBC_TEST_DSN "@VTK_ODBC_TEST_DSN@"
#endif
/* Is a test PostgreSQL database URL defined? */
#cmakedefine VTK_PSQL_TEST_URL
#ifdef VTK_PSQL_TEST_URL
# undef VTK_PSQL_TEST_URL
# define VTK_PSQL_TEST_URL "@VTK_PSQL_TEST_URL@"
#endif
/* Is a test MySQL database URL defined? */
#cmakedefine VTK_MYSQL_TEST_URL
#ifdef VTK_MYSQL_TEST_URL
# undef VTK_MYSQL_TEST_URL
# define VTK_MYSQL_TEST_URL "@VTK_MYSQL_TEST_URL@"
#endif
/* Debug leaks support. */
#cmakedefine VTK_DEBUG_LEAKS
......
......@@ -27,18 +27,6 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkSQLiteDatabase.h"
#ifdef VTK_USE_POSTGRES
#include "vtkPostgreSQLDatabase.h"
#endif // VTK_USE_POSTGRES
#ifdef VTK_USE_MYSQL
#include "vtkMySQLDatabase.h"
#endif // VTK_USE_MYSQL
#ifdef VTK_USE_ODBC
#include "vtkODBCDatabase.h"
#endif // VTK_USE_ODBC
#include "vtkCriticalSection.h"
#include "vtkObjectFactory.h"
#include "vtkStdString.h"
......@@ -423,30 +411,6 @@ vtkSQLDatabase* vtkSQLDatabase::CreateFromURL( const char* URL )
return 0;
}
#ifdef VTK_USE_POSTGRES
if ( protocol == "psql" )
{
db = vtkPostgreSQLDatabase::New();
db->ParseURL( URL );
}
#endif // VTK_USE_POSTGRES
#ifdef VTK_USE_MYSQL
if ( protocol == "mysql" )
{
db = vtkMySQLDatabase::New();
db->ParseURL( URL );
}
#endif // VTK_USE_MYSQL
#ifdef VTK_USE_ODBC
if ( protocol == "odbc" )
{
db = vtkODBCDatabase::New();
db->ParseURL( URL );
}
#endif // VTK_USE_ODBC
// Now try to look at registered callback to try and find someone who can
// provide us with the required implementation.
if (!db && vtkSQLDatabase::Callbacks)
......
......@@ -15,10 +15,6 @@
#include "vtkOpenGL2ContextDevice2D.h"
#ifdef VTK_USE_QT
# include <QApplication>
# include "vtkQtStringToImage.h"
#endif
#include "vtkFreeTypeStringToImage.h"
#include "vtkVector.h"
......
......@@ -15,10 +15,6 @@
#include "vtkOpenGLContextDevice2D.h"
#ifdef VTK_USE_QT
# include <QApplication>
# include "vtkQtStringToImage.h"
#endif
#include "vtkFreeTypeStringToImage.h"
#include "vtkVector.h"
......@@ -1110,14 +1106,6 @@ void vtkOpenGLContextDevice2D::EnableClipping(bool enable)
//-----------------------------------------------------------------------------
bool vtkOpenGLContextDevice2D::SetStringRendererToFreeType()
{
#ifdef VTK_USE_QT
// We will likely be using the Qt rendering strategy
if (this->TextRenderer->IsA("vtkQtStringToImage"))
{
this->TextRenderer->Delete();
this->TextRenderer = vtkFreeTypeStringToImage::New();
}
#endif
// FreeType is the only choice - nothing to do here
return true;
}
......@@ -1125,18 +1113,6 @@ bool vtkOpenGLContextDevice2D::SetStringRendererToFreeType()
//-----------------------------------------------------------------------------
bool vtkOpenGLContextDevice2D::SetStringRendererToQt()
{
#ifdef VTK_USE_QT
// We will likely be using the Qt rendering strategy
if (this->TextRenderer->IsA("vtkQtStringToImage"))
{
return true;
}
else
{
this->TextRenderer->Delete();
this->TextRenderer = vtkQtStringToImage::New();
}
#endif
// The Qt based strategy is not available
return false;
}
......
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