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

4 files changed, 12 insertions, 10 deletions

diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp
index e994d8ed..f84310e2 100644
--- a/kview/config/kviewconfmodules.cpp
+++ b/kview/config/kviewconfmodules.cpp
@@ -32,15 +32,15 @@
 typedef KGenericFactory<KViewGeneralConfig, TQWidget> KViewGeneralConfigFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kviewgeneralconfig, KViewGeneralConfigFactory( "kcm_kviewgeneralconfig" ) )
 
-KViewGeneralConfig::KViewGeneralConfig( TQWidget * parent, const char * /*name*/, const TQStringList & args )
-	: KCModule( KViewGeneralConfigFactory::instance(), parent, args )
+KViewGeneralConfig::KViewGeneralConfig( TQWidget * tqparent, const char * /*name*/, const TQStringList & args )
+	: KCModule( KViewGeneralConfigFactory::instance(), tqparent, args )
 {
-	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
 
 	m_pResizeGroup = new TQVButtonGroup( i18n( "Resizing" ), this );
-	m_pResizeGroup->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+	m_pResizeGroup->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
 	connect( m_pResizeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( resizeChanged( int ) ) );
-	layout->addWidget( m_pResizeGroup );
+	tqlayout->addWidget( m_pResizeGroup );
 
 	( void )new TQRadioButton( i18n( "Only resize window" ), m_pResizeGroup );
 	( void )new TQRadioButton( i18n( "Resize image to fit window" ), m_pResizeGroup );
diff --git a/kview/config/kviewconfmodules.h b/kview/config/kviewconfmodules.h
index 1c9c1e7f..bd01dbaf 100644
--- a/kview/config/kviewconfmodules.h
+++ b/kview/config/kviewconfmodules.h
@@ -26,8 +26,9 @@ class TQVButtonGroup;
 class KViewGeneralConfig : public KCModule
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		KViewGeneralConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() );
+		KViewGeneralConfig( TQWidget * tqparent, const char * name = 0, const TQStringList & args = TQStringList() );
 		~KViewGeneralConfig();
 
 		virtual void load();
diff --git a/kview/config/plugins/kviewpluginsconfig.cpp b/kview/config/plugins/kviewpluginsconfig.cpp
index bad5bd55..cf085d3c 100644
--- a/kview/config/plugins/kviewpluginsconfig.cpp
+++ b/kview/config/plugins/kviewpluginsconfig.cpp
@@ -28,11 +28,11 @@
 typedef KGenericFactory<KViewPluginsConfig, TQWidget> KViewPluginsConfigFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kviewpluginsconfig, KViewPluginsConfigFactory( "kcm_kviewpluginsconfig" ) )
 
-KViewPluginsConfig::KViewPluginsConfig( TQWidget * parent, const char *, const TQStringList & args )
-	: KSettings::PluginPage( KViewPluginsConfigFactory::instance(), parent, args )
+KViewPluginsConfig::KViewPluginsConfig( TQWidget * tqparent, const char *, const TQStringList & args )
+	: KSettings::PluginPage( KViewPluginsConfigFactory::instance(), tqparent, args )
 {
 	m_config = new KSimpleConfig( "kviewrc" );
-	pluginSelector()->addPlugins( TQString::fromAscii( "kview" ), i18n( "Application" ), TQString::null, m_config );
+	pluginSelector()->addPlugins( TQString::fromAscii( "kview" ), i18n( "Application" ), TQString(), m_config );
 	pluginSelector()->setShowEmptyConfigPage( false );
 }
 
diff --git a/kview/config/plugins/kviewpluginsconfig.h b/kview/config/plugins/kviewpluginsconfig.h
index 4095944d..3353bf6b 100644
--- a/kview/config/plugins/kviewpluginsconfig.h
+++ b/kview/config/plugins/kviewpluginsconfig.h
@@ -26,8 +26,9 @@ class KConfig;
 class KViewPluginsConfig : public KSettings::PluginPage
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		KViewPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() );
+		KViewPluginsConfig( TQWidget * tqparent, const char * name = 0, const TQStringList & args = TQStringList() );
 		~KViewPluginsConfig();
 	private:
 		KConfig * m_config;