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

10 files changed, 75 insertions, 70 deletions

diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp
index ea876950..a1576b49 100644
--- a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp
+++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp
@@ -30,11 +30,11 @@
 typedef KGenericFactory<KViewViewerPluginsConfig, TQWidget> KViewViewerPluginsConfigFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kviewviewerpluginsconfig, KViewViewerPluginsConfigFactory( "kcm_kviewviewerpluginsconfig" ) )
 
-KViewViewerPluginsConfig::KViewViewerPluginsConfig( TQWidget * parent, const char *, const TQStringList & args )
-	: KSettings::PluginPage( KViewViewerPluginsConfigFactory::instance(), parent, args )
+KViewViewerPluginsConfig::KViewViewerPluginsConfig( TQWidget * tqparent, const char *, const TQStringList & args )
+	: KSettings::PluginPage( KViewViewerPluginsConfigFactory::instance(), tqparent, args )
 {
 	m_config = new KSimpleConfig( "kviewviewerrc" );
-	pluginSelector()->addPlugins( TQString::fromAscii( "kviewviewer" ), i18n( "Viewer" ), TQString::null, m_config );
+	pluginSelector()->addPlugins( TQString::fromAscii( "kviewviewer" ), i18n( "Viewer" ), TQString(), m_config );
 	pluginSelector()->setShowEmptyConfigPage( false );
 }
 
diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.h b/kview/kviewviewer/config/kviewviewerpluginsconfig.h
index 1dbe39c3..94860fc9 100644
--- a/kview/kviewviewer/config/kviewviewerpluginsconfig.h
+++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.h
@@ -26,8 +26,9 @@ class KConfig;
 class KViewViewerPluginsConfig : public KSettings::PluginPage
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		KViewViewerPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() );
+		KViewViewerPluginsConfig( TQWidget * tqparent, const char * name = 0, const TQStringList & args = TQStringList() );
 		~KViewViewerPluginsConfig();
 	private:
 		KConfig * m_config;
diff --git a/kview/kviewviewer/imagesettings.cpp b/kview/kviewviewer/imagesettings.cpp
index 0ee58b78..10781565 100644
--- a/kview/kviewviewer/imagesettings.cpp
+++ b/kview/kviewviewer/imagesettings.cpp
@@ -24,20 +24,20 @@
 #include <klocale.h>
 #include <kdialog.h>
 
-ImageSettings::ImageSettings( TQWidget * parent, const char * name )
-	: KPrintDialogPage( parent, name )
+ImageSettings::ImageSettings( TQWidget * tqparent, const char * name )
+	: KPrintDialogPage( tqparent, name )
 	, m_pFitImage( 0 )
 {
 	setTitle( i18n( "Image Settings" ) );
 
-	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
 	m_pFitImage = new TQCheckBox( i18n( "Fit image to page size" ), this );
 	m_pFitImage->setChecked( true );
-	layout->addWidget( m_pFitImage );
+	tqlayout->addWidget( m_pFitImage );
 	m_pCenter = new TQCheckBox( i18n( "Center image on page" ), this );
 	m_pCenter->setChecked( true );
-	layout->addWidget( m_pCenter );
-	layout->insertStretch( -1, 0 );
+	tqlayout->addWidget( m_pCenter );
+	tqlayout->insertStretch( -1, 0 );
 }
 
 ImageSettings::~ImageSettings()
diff --git a/kview/kviewviewer/imagesettings.h b/kview/kviewviewer/imagesettings.h
index f627cbac..07bb9af8 100644
--- a/kview/kviewviewer/imagesettings.h
+++ b/kview/kviewviewer/imagesettings.h
@@ -26,8 +26,9 @@ class TQCheckBox;
 class ImageSettings : public KPrintDialogPage
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		ImageSettings( TQWidget * parent = 0, const char * name = 0 );
+		ImageSettings( TQWidget * tqparent = 0, const char * name = 0 );
 		~ImageSettings();
 
 		void setOptions( const TQMap<TQString, TQString> & opts );
diff --git a/kview/kviewviewer/kviewkonqextension.cpp b/kview/kviewviewer/kviewkonqextension.cpp
index b3f16a93..b47ea17d 100644
--- a/kview/kviewviewer/kviewkonqextension.cpp
+++ b/kview/kviewviewer/kviewkonqextension.cpp
@@ -33,9 +33,9 @@
 #include <klocale.h>
 
 KViewKonqExtension::KViewKonqExtension( KImageViewer::Canvas * canvas,
-		KViewViewer *parent, const char *name )
-	: KParts::BrowserExtension( parent, name ),
-	m_pViewer( parent ),
+		KViewViewer *tqparent, const char *name )
+	: KParts::BrowserExtension( tqparent, name ),
+	m_pViewer( tqparent ),
 	m_pCanvas( canvas )
 {
     KGlobal::locale()->insertCatalogue("kview");
@@ -68,7 +68,7 @@ void KViewKonqExtension::print()
 	printer.addDialogPage( new ImageSettings );
 	printer.setDocName( "KView: " + m_pViewer->url().fileName( false ) );
 
-	if ( !printer.setup( ((KViewViewer *)parent())->widget(), i18n("Print %1").arg(m_pViewer->url().fileName( false )) ) )
+	if ( !printer.setup( ((KViewViewer *)tqparent())->widget(), i18n("Print %1").tqarg(m_pViewer->url().fileName( false )) ) )
 		return;
 
 	TQPainter painter;
@@ -80,7 +80,7 @@ void KViewKonqExtension::print()
 
 	TQImage imagetoprint;
 	if( printer.option( "app-kviewviewer-fitimage" ) == "1" )
-		imagetoprint = m_pCanvas->image()->smoothScale( metrics.width(), metrics.height(), TQImage::ScaleMin );
+		imagetoprint = m_pCanvas->image()->smoothScale( metrics.width(), metrics.height(), TQ_ScaleMin );
 	else
 		imagetoprint = *m_pCanvas->image();
 
diff --git a/kview/kviewviewer/kviewkonqextension.h b/kview/kviewviewer/kviewkonqextension.h
index b7692f31..fa986c81 100644
--- a/kview/kviewviewer/kviewkonqextension.h
+++ b/kview/kviewviewer/kviewkonqextension.h
@@ -29,8 +29,9 @@ class KViewKonqExtension: public KParts::BrowserExtension
 {
 	friend class KViewViewer; // it can emit our signals
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		KViewKonqExtension( KImageViewer::Canvas *, KViewViewer *parent, const char *name = 0 );
+		KViewKonqExtension( KImageViewer::Canvas *, KViewViewer *tqparent, const char *name = 0 );
 		virtual ~KViewKonqExtension() {}
 
 		virtual void setXYOffset( int x, int y );
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index 06dd1716..e566b74b 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -55,10 +55,10 @@
 typedef KParts::GenericFactory<KViewViewer> KViewViewerFactory;
 K_EXPORT_COMPONENT_FACTORY( libkviewviewer, KViewViewerFactory )
 
-KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/,
-		TQObject *parent, const char *name, const TQStringList & )
-	: KImageViewer::Viewer( parent, name )
-	, m_pParentWidget( parentWidget )
+KViewViewer::KViewViewer( TQWidget *tqparentWidget, const char * /*widgetName*/,
+		TQObject *tqparent, const char *name, const TQStringList & )
+	: KImageViewer::Viewer( tqparent, name )
+	, m_pParentWidget( tqparentWidget )
 	, m_pJob( 0 )
 	, m_pExtension( 0 )
 	, m_pCanvas( 0 )
@@ -69,7 +69,7 @@ KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/,
 	KImageIO::registerFormats();
 
 	TQWidget * widget =  KParts::ComponentFactory::createInstanceFromQuery<TQWidget>(
-			"KImageViewer/Canvas", TQString::null, m_pParentWidget );
+			"KImageViewer/Canvas", TQString(), TQT_TQOBJECT(m_pParentWidget) );
 	m_pCanvas = static_cast<KImageViewer::Canvas *>( widget->qt_cast( "KImageViewer::Canvas" ) );
 	kdDebug( 4610 ) << "KImageViewer::Canvas at " << m_pCanvas << endl;
 	if( ! ( widget && m_pCanvas ) )
@@ -148,10 +148,10 @@ KViewViewer::~KViewViewer()
 		int res = m_url.isEmpty() ?
 			KMessageBox::warningYesNo( widget(),
 				i18n( "This is a new document.\nDo you want to save it ?" ),
-				TQString::null, KStdGuiItem::saveAs(), KStdGuiItem::discard() ):
+				TQString(), KStdGuiItem::saveAs(), KStdGuiItem::discard() ):
 			KMessageBox::warningYesNo( widget(),
 				i18n( "The document has been modified.\nDo you want to save it ?" ),
-				TQString::null, KStdGuiItem::saveAs(), KStdGuiItem::dontSave() );
+				TQString(), KStdGuiItem::saveAs(), KStdGuiItem::dontSave() );
 
 		if( res == KMessageBox::Yes )
 		{
@@ -259,11 +259,11 @@ bool KViewViewer::openURL( const KURL & url )
 		// Use same extension as remote file. This is important for mimetype-determination (e.g. koffice)
 		TQString extension;
 		TQString fileName = url.fileName();
-		int extensionPos = fileName.findRev( '.' );
+		int extensionPos = fileName.tqfindRev( '.' );
 		if ( extensionPos != -1 )
 			extension = fileName.mid( extensionPos ); // keep the '.'
 		delete m_pTempFile;
-		m_pTempFile = new KTempFile( TQString::null, extension );
+		m_pTempFile = new KTempFile( TQString(), extension );
 		m_file = m_pTempFile->name();
 
 		m_pJob = KIO::get( m_url, m_pExtension->urlArgs().reload, isProgressInfoEnabled() );
@@ -294,7 +294,7 @@ void KViewViewer::newImage( const TQImage & newimg )
 	if( closeURL() )
 	{
 		m_url = "";
-		m_file = TQString::null;
+		m_file = TQString();
 		m_sCaption = i18n( "Title caption when new image selected", "new image" );
 		m_pCanvas->setImage( newimg );
 		if( isReadWrite() )
@@ -397,7 +397,7 @@ bool KViewViewer::openFile()
 		}
 		else
 		{
-			emit setStatusBarText( i18n( "Unknown image format: %1" ).arg( m_url.prettyURL() ) );
+			emit setStatusBarText( i18n( "Unknown image format: %1" ).tqarg( m_url.prettyURL() ) );
 			return false;
 		}
 	}
@@ -406,12 +406,12 @@ bool KViewViewer::openFile()
 		kdDebug( 4610 ) << k_funcinfo << " load from file: " << m_file << endl;
 		if( ! TQFile::exists( m_file ) )
 		{
-			emit setStatusBarText( i18n( "No such file: %1" ).arg( m_file ) );
+			emit setStatusBarText( i18n( "No such file: %1" ).tqarg( m_file ) );
 			return false;
 		}
 		if( TQImage::imageFormat( m_file ) == 0 )
 		{
-			emit setStatusBarText( i18n( "Unknown image format: %1" ).arg( m_file ) );
+			emit setStatusBarText( i18n( "Unknown image format: %1" ).tqarg( m_file ) );
 			return false;
 		}
 		// determine Mime Type
@@ -450,7 +450,7 @@ bool KViewViewer::saveFile()
 	if( ! m_newMimeType.isNull() )
 	{
 		m_mimeType = m_newMimeType;
-		m_newMimeType = TQString::null;
+		m_newMimeType = TQString();
 	}
 	TQString type = KImageIO::typeForMime( m_mimeType );
 	kdDebug( 4610 ) << "save m_pCanvas->image() to " << m_file << " as " << type << endl;
@@ -567,7 +567,7 @@ void KViewViewer::writeSettings()
 void KViewViewer::zoomChanged( double zoom )
 {
 	kdDebug( 4610 ) << k_funcinfo << endl;
-	emit setWindowCaption( m_sCaption + TQString( " (%1%)" ).arg( zoom * 100, 0, 'f', 0 ) );
+	emit setWindowCaption( m_sCaption + TQString( " (%1%)" ).tqarg( zoom * 100, 0, 'f', 0 ) );
 	updateZoomMenu( zoom );
 }
 
@@ -610,7 +610,7 @@ void KViewViewer::slotSave()
 void KViewViewer::slotSaveAs()
 {
 	kdDebug( 4610 ) << k_funcinfo << endl;
-	KFileDialog dlg( TQString::null, TQString::null, widget(), "filedialog", true );
+	KFileDialog dlg( TQString(), TQString(), widget(), "filedialog", true );
 	dlg.setMimeFilter( KImageIO::mimeTypes( KImageIO::Writing ) );
 	dlg.setSelection( m_url.fileName() );
 	dlg.setCaption( i18n( "Save As" ) );
@@ -645,7 +645,7 @@ void KViewViewer::setZoom( const TQString & newZoom )
 	kdDebug( 4610 ) << k_funcinfo << newZoom << endl;
 	double zoom;
 	TQString z = newZoom;
-	z.remove( z.find( '%' ), 1 );
+	z.remove( z.tqfind( '%' ), 1 );
 	if( newZoom == "33%" )
 		zoom = 1.0 / 3.0;
 	else
@@ -667,14 +667,14 @@ void KViewViewer::updateZoomMenu( double zoom )
 		TQStringList itemsList = m_paZoom->items();
 		for( TQStringList::Iterator it = itemsList.begin(); it != itemsList.end(); ++it )
 		{
-			z = ( *it ).replace( TQRegExp( "%" ), "" );
+			z = ( *it ).tqreplace( TQRegExp( "%" ), "" );
 			z = z.simplifyWhiteSpace();
 			val = z.toInt( &ok );
-			if( ok && val > 0 && list.contains( val ) == 0 )
+			if( ok && val > 0 && list.tqcontains( val ) == 0 )
 				list << val;
 		}
 		val = TQString::number( zoom * 100, 'f', 0 ).toInt(); // round/lround from math.h doesn't work - dunno
-		if( list.contains( val ) == 0 )
+		if( list.tqcontains( val ) == 0 )
 			list.append( val );
 
 		qHeapSort( list );
@@ -685,9 +685,9 @@ void KViewViewer::updateZoomMenu( double zoom )
 	}
 
 	// first look if it's a new value (not in the list yet)
-	TQString z = TQString( "%1%" ).arg( zoom * 100, 0, 'f', 0 );
+	TQString z = TQString( "%1%" ).tqarg( zoom * 100, 0, 'f', 0 );
 	TQStringList items = m_paZoom->items();
-	int idx = items.findIndex( z );
+	int idx = items.tqfindIndex( z );
 	if( -1 == idx )
 	{
 		// not found XXX: remove when done
@@ -773,7 +773,7 @@ void KViewViewer::slotResultSaveAs( KIO::Job *job )
 	else
 	{
 		emit completed();
-		KIO::CopyJob * cjob = ::qt_cast<KIO::CopyJob*>( job );
+		KIO::CopyJob * cjob = ::tqqt_cast<KIO::CopyJob*>( job );
 		if( cjob )
 		{
 			m_url = cjob->destURL();
@@ -803,21 +803,21 @@ void KViewViewer::slotFileDirty( const TQString & )
 	if( isModified() && isReadWrite() )
 	{
 		KPassivePopup * pop = new KPassivePopup( m_pParentWidget );
-		TQVBox * vb = pop->standardView( i18n( "Load changed image? - %1" ).arg( kapp->aboutData()->programName() ),
-				TQString::null, kapp->miniIcon() );
+		TQVBox * vb = pop->standardView( i18n( "Load changed image? - %1" ).tqarg( kapp->aboutData()->programName() ),
+				TQString(), kapp->miniIcon() );
 		( void )new TQLabel( i18n( "The image %1 which you have modified has changed on disk.\n"
 								  "Do you want to reload the file and lose your changes?\n"
 								  "If you don't and subsequently save the image, you will lose the\n"
-								  "changes that have already been saved." ).arg( url().fileName() ), vb );
+								  "changes that have already been saved." ).tqarg( url().fileName() ), vb );
 		TQWidget * hb = new TQWidget( vb );
-		TQHBoxLayout * layout = new TQHBoxLayout( hb );
-		layout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+		TQHBoxLayout * tqlayout = new TQHBoxLayout( hb );
+		tqlayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 		KPushButton * yes = new KPushButton( i18n("Reload"), hb );
-		layout->addWidget( yes );
-		layout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+		tqlayout->addWidget( yes );
+		tqlayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 		KPushButton * no = new KPushButton( i18n("Do Not Reload"), hb );
-		layout->addWidget( no );
-		layout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+		tqlayout->addWidget( no );
+		tqlayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 		connect( yes, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotReloadUnmodified() ) );
 		connect( yes, TQT_SIGNAL( clicked() ), pop, TQT_SLOT( hide() ) );
 		connect( no, TQT_SIGNAL( clicked() ), pop, TQT_SLOT( hide() ) );
diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h
index 0dc5d6a3..1d79696e 100644
--- a/kview/kviewviewer/kviewviewer.h
+++ b/kview/kviewviewer/kviewviewer.h
@@ -45,11 +45,12 @@ class TQCache;
 class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIface
 {
 	Q_OBJECT
+  TQ_OBJECT
 	friend class KViewKonqExtension;
 
 	public:
-		KViewViewer( TQWidget * parentWidget, const char * widgetName,
-				TQObject * parent, const char * name, const TQStringList & );
+		KViewViewer( TQWidget * tqparentWidget, const char * widgetName,
+				TQObject * tqparent, const char * name, const TQStringList & );
 		virtual ~KViewViewer();
 
 		KImageViewer::Canvas * canvas() const { return m_pCanvas; }
diff --git a/kview/kviewviewer/printimagesettings.ui b/kview/kviewviewer/printimagesettings.ui
index 4944ef3c..3c5418af 100644
--- a/kview/kviewviewer/printimagesettings.ui
+++ b/kview/kviewviewer/printimagesettings.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>PrintImageSettings</class>
 <author>Matthias Kretz &lt;kretz@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>PrintImageSettings</cstring>
     </property>
@@ -23,9 +23,9 @@
         <property name="spacing">
             <number>0</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -37,9 +37,9 @@
                 <property name="spacing">
                     <number>0</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -48,7 +48,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QButtonGroup">
+                        <widget class="TQButtonGroup">
                             <property name="name">
                                 <cstring>buttonGroup1</cstring>
                             </property>
@@ -59,7 +59,7 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>radioButton1</cstring>
                                     </property>
@@ -67,7 +67,7 @@
                                         <string>Fit to page size</string>
                                     </property>
                                 </widget>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>radioButton2</cstring>
                                     </property>
@@ -75,7 +75,7 @@
                                         <string>9x13</string>
                                     </property>
                                 </widget>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>radioButton3</cstring>
                                     </property>
@@ -83,7 +83,7 @@
                                         <string>10x15</string>
                                     </property>
                                 </widget>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>radioButton4</cstring>
                                     </property>
@@ -91,9 +91,9 @@
                                         <string>Manual</string>
                                     </property>
                                 </widget>
-                                <widget class="QLayoutWidget">
+                                <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>layout1</cstring>
+                                        <cstring>tqlayout1</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -104,7 +104,7 @@
                                                 <cstring>kIntSpinBox1</cstring>
                                             </property>
                                         </widget>
-                                        <widget class="QLabel">
+                                        <widget class="TQLabel">
                                             <property name="name">
                                                 <cstring>textLabel1</cstring>
                                             </property>
@@ -129,7 +129,7 @@
                                 </widget>
                             </vbox>
                         </widget>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>checkBox1</cstring>
                             </property>
@@ -149,7 +149,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -168,7 +168,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>0</width>
                     <height>0</height>
@@ -180,10 +180,10 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>qwidget.h</includehint>
+    <includehint>tqwidget.h</includehint>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/kview/kviewviewer/test/test.h b/kview/kviewviewer/test/test.h
index 82777090..c97a8951 100644
--- a/kview/kviewviewer/test/test.h
+++ b/kview/kviewviewer/test/test.h
@@ -13,6 +13,7 @@ namespace KParts { class ReadWritePart; }
 class Test : public KParts::MainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     Test();
     virtual ~Test();