From e69e8b1d09fb579316595b4e6a850e717358a8b1 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 19 Jun 2011 19:03:33 +0000
Subject: TQt4 port kdegraphics This enables compilation under both Qt3 and Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kview/kimageviewer/canvas.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kview/kimageviewer/canvas.h')

diff --git a/kview/kimageviewer/canvas.h b/kview/kimageviewer/canvas.h
index 18aae3be..51736844 100644
--- a/kview/kimageviewer/canvas.h
+++ b/kview/kimageviewer/canvas.h
@@ -29,7 +29,7 @@ class TQPoint;
 class TQWidget;
 
 #include <tqstring.h>
-#include <qobjectdefs.h>
+#include <tqobjectdefs.h>
 #include <kdemacros.h>
 namespace KImageViewer
 {
@@ -47,7 +47,7 @@ namespace KImageViewer
  * your program:
  *
  * <pre>
-   TQWidget * widget = KParts::ComponentFactory::createInstanceFromQuery<TQWidget>( "KImageViewer/Canvas", TQString::null, this );
+   TQWidget * widget = KParts::ComponentFactory::createInstanceFromQuery<TQWidget>( "KImageViewer/Canvas", TQString(), this );
    m_canvas = static_cast<KImageViewer::Canvas *>( widget->qt_cast( "KImageViewer::Canvas" ) );
    if( ! ( widget && m_canvas ) )
    {
@@ -151,7 +151,7 @@ class KDE_EXPORT Canvas
 		/**
 		 * @return the description of the blend effect
 		 */
-		virtual TQString blendEffectDescription( unsigned int ) const { return TQString::null; }
+		virtual TQString blendEffectDescription( unsigned int ) const { return TQString(); }
 
 		/**
 		 * Sets the blending effect used to create a transition between images
-- 
cgit v1.2.1