More qt5 porting (qprinter and qftp), removed some warnings

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6263 17fca916-40b9-46aa-a4ea-0a15b648b75c

2 files changed, 2 insertions, 25 deletions

diff --git a/src/modules/objects/KvsObject_painter.cpp b/src/modules/objects/KvsObject_painter.cpp
index 8e31810b1..968e9434c 100644
--- a/src/modules/objects/KvsObject_painter.cpp
+++ b/src/modules/objects/KvsObject_painter.cpp
@@ -33,9 +33,7 @@
 #include "KviError.h"
 #include "KviIconManager.h"
 #include "KviMemory.h"
-#if (QT_VERSION < 0x050000)
-	#include <QPrintDialog>
-#endif
+#include <QPrintDialog>
 #include <QTextDocument>
 #include <QIcon>
 
@@ -622,9 +620,7 @@ KVSO_BEGIN_CONSTRUCTOR(KvsObject_painter,KviKvsObject)
 
 	m_pPainter = new QPainter();
 	bDonotdeleteinternalqpainter=false;
-#if (QT_VERSION < 0x050000)
 	m_pPrinter = 0 ;
-#endif
 	m_pDeviceObject=0;
 	m_pPainterPath=0;
 	m_pGradient=0;
@@ -639,10 +635,8 @@ KVSO_BEGIN_DESTRUCTOR(KvsObject_painter)
 		m_pGradient=0;
 	if (m_pPainter && !bDonotdeleteinternalqpainter) delete m_pPainter;
 		m_pPainter = 0;
-#if (QT_VERSION < 0x050000)
 	if (m_pPrinter) delete m_pPrinter;
 		m_pPrinter = 0;
-#endif
 
 KVSO_END_CONSTRUCTOR(KvsObject_painter)
 
@@ -1164,10 +1158,6 @@ KVSO_CLASS_FUNCTION(painter,begin)
 	{
 		QString szDev;
 		v->asString(szDev);
-#if (QT_VERSION >= 0x050000)
-		c->warning(__tr2qs_ctx("No valid paint device","objects"));
-		return true;
-#else
 		if(KviQString::equalCI(szDev,"printer") || KviQString::equalCI(szDev,"pdf"))
 		{
 			if (m_pPrinter) delete m_pPrinter;
@@ -1202,7 +1192,6 @@ KVSO_CLASS_FUNCTION(painter,begin)
 		}
 		m_pPainter->begin(m_pPrinter);
 		return true;
-#endif
 	} else if (v->isHObject()) {
 		v->asHObject(hObject);
 		pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
@@ -1245,13 +1234,11 @@ void KvsObject_painter::detachDevice()
 	if(!m_pDeviceObject)return;
 	disconnect(m_pDeviceObject,SIGNAL(aboutToDie()),this,SLOT(detachDevice()));
 	m_pPainter->end();
-#if (QT_VERSION < 0x050000)
 	if (m_pPrinter)
 	{
 		delete m_pPrinter;
 		m_pPrinter=0;
 	}
-#endif
 	m_pDeviceObject = 0;
 }
 
@@ -1262,13 +1249,11 @@ KVSO_CLASS_FUNCTION(painter,end)
 	if(!m_pDeviceObject)
 	{
 		m_pPainter->end();
-#if (QT_VERSION < 0x050000)
 		if (m_pPrinter)
 		{
 			delete m_pPrinter;
 			m_pPrinter=0;
 		}
-#endif
 	}
 	else detachDevice();
 	return true;
@@ -1281,13 +1266,11 @@ KVSO_CLASS_FUNCTION(painter,beginPdf)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("file_name",KVS_PT_STRING,0,szFileName)
 	KVSO_PARAMETERS_END(c)
-#if (QT_VERSION < 0x050000)
 	if (m_pPrinter) delete m_pPrinter;
 	m_pPrinter=new QPrinter();//QPrinter::HighResolution);
 	m_pPrinter->setOutputFormat(QPrinter::PdfFormat);
 	m_pPrinter->setOutputFileName(szFileName);
 	m_pPainter->begin(m_pPrinter);
-#endif
 	return true;
 }
 
diff --git a/src/modules/objects/KvsObject_painter.h b/src/modules/objects/KvsObject_painter.h
index dc69396d4..33b131176 100644
--- a/src/modules/objects/KvsObject_painter.h
+++ b/src/modules/objects/KvsObject_painter.h
@@ -25,12 +25,8 @@
 //
 //=============================================================================
 
-#warning QPrinter support in KvsObject_painter needs Qt5PrintSupport module: cmake rules, ifdefs, etc
-
 #include "object_macros.h"
-#if (QT_VERSION < 0x050000)
-	#include <QPrinter>
-#endif
+#include <QPrinter>
 
 #include <QPainter>
 #include <QPaintDevice>
@@ -44,9 +40,7 @@ class KvsObject_painter : public KviKvsObject
 public:
 	KVSO_DECLARE_OBJECT(KvsObject_painter)
 protected:
-#if (QT_VERSION < 0x050000)
 	QPrinter * m_pPrinter;
-#endif
 	bool bDonotdeleteinternalqpainter;
 	QPainter * m_pPainter;
 	QMatrix  m_pMatrix;