TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

16 files changed, 101 insertions, 93 deletions

diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp
index 0423f1a5..e8cd73fd 100644
--- a/kompare/libdialogpages/diffpage.cpp
+++ b/kompare/libdialogpages/diffpage.cpp
@@ -42,7 +42,7 @@
 
 #include "diffpage.h"
 
-DiffPage::DiffPage( TQWidget* parent ) : PageBase( parent ),
+DiffPage::DiffPage( TQWidget* tqparent ) : PageBase( tqparent ),
 	m_ignoreRegExpDialog( 0 )
 {
 	addDiffTab();
@@ -146,7 +146,7 @@ void DiffPage::setDefaults()
 	m_ignoreTabExpansionCheckBox->setChecked( false );
 	m_ignoreRegExpCheckBox->setChecked( false );
 
-	m_ignoreRegExpEdit->setText( TQString::null );
+	m_ignoreRegExpEdit->setText( TQString() );
 
 	m_locSpinBox->setValue( 3 );
 
@@ -160,7 +160,7 @@ void DiffPage::setDefaults()
 void DiffPage::slotShowRegExpEditor()
 {
 	if ( ! m_ignoreRegExpDialog )
-		m_ignoreRegExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString::null, this );
+		m_ignoreRegExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
 
 	KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( m_ignoreRegExpDialog->qt_cast( "KRegExpEditorInterface" ) );
 
@@ -203,20 +203,20 @@ void DiffPage::slotExcludeFileToggled( bool on )
 void DiffPage::addDiffTab()
 {
 	TQWidget* page   = new TQWidget( this );
-	TQVBoxLayout* layout = new TQVBoxLayout( page );
-	layout->setSpacing( KDialog::spacingHint() );
-	layout->setMargin( KDialog::marginHint() );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
+	tqlayout->setSpacing( KDialog::spacingHint() );
+	tqlayout->setMargin( KDialog::marginHint() );
 
 	// add diff program selector
 	m_diffProgramGroup = new TQVButtonGroup( i18n( "Diff Program" ), page );
-	layout->addWidget( m_diffProgramGroup );
+	tqlayout->addWidget( m_diffProgramGroup );
 	m_diffProgramGroup->setMargin( KDialog::marginHint() );
 
 	m_diffURLRequester = new KURLRequester( m_diffProgramGroup, "diffURLRequester" );
 	TQWhatsThis::add( m_diffURLRequester, i18n( "You can select a different diff program here. On Solaris the standard diff program does not support all the options that the GNU version does. This way you can select that version." ) );
 
-	layout->addStretch( 1 );
-	page->setMinimumSize( sizeHintForWidget( page ) );
+	tqlayout->addStretch( 1 );
+	page->setMinimumSize( tqsizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Diff" ) );
 }
@@ -224,14 +224,14 @@ void DiffPage::addDiffTab()
 void DiffPage::addFormatTab()
 {
 	TQWidget* page   = new TQWidget( this );
-	TQVBoxLayout* layout = new TQVBoxLayout( page );
-	layout->setSpacing( KDialog::spacingHint() );
-	layout->setMargin( KDialog::marginHint() );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
+	tqlayout->setSpacing( KDialog::spacingHint() );
+	tqlayout->setMargin( KDialog::marginHint() );
 
 	// add diff modes
 	m_modeButtonGroup = new TQVButtonGroup( i18n( "Output Format" ), page );
 	TQWhatsThis::add( m_modeButtonGroup, i18n( "Select the format of the output generated by diff. Unified is the one that is used most frequently because it is very readable. The KDE developers like this format the best so use it for sending patches." ) );
-	layout->addWidget( m_modeButtonGroup );
+	tqlayout->addWidget( m_modeButtonGroup );
 	m_modeButtonGroup->setMargin( KDialog::marginHint() );
 
 	TQRadioButton* radioButton;
@@ -245,7 +245,7 @@ void DiffPage::addFormatTab()
 
 	// #lines of context (loc)
 	TQHGroupBox* groupBox = new TQHGroupBox( i18n( "Lines of Context" ), page );
-	layout->addWidget( groupBox );
+	tqlayout->addWidget( groupBox );
 	groupBox->setMargin( KDialog::marginHint() );
 
 	TQLabel* label = new TQLabel( i18n( "Number of context lines:" ), groupBox );
@@ -253,8 +253,8 @@ void DiffPage::addFormatTab()
 	TQWhatsThis::add( m_locSpinBox, i18n( "The number of context lines is normally 2 or 3. This makes the diff readable and applicable in most cases. More than 3 lines will only bloat the diff unnecessarily." ) );
 	label->setBuddy( m_locSpinBox );
 
-	layout->addStretch( 1 );
-	page->setMinimumSize( sizeHintForWidget( page ) );
+	tqlayout->addStretch( 1 );
+	page->setMinimumSize( tqsizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Format" ) );
 }
@@ -262,13 +262,13 @@ void DiffPage::addFormatTab()
 void DiffPage::addOptionsTab()
 {
 	TQWidget* page   = new TQWidget( this );
-	TQVBoxLayout* layout = new TQVBoxLayout( page );
-	layout->setSpacing( KDialog::spacingHint() );
-	layout->setMargin( KDialog::marginHint() );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
+	tqlayout->setSpacing( KDialog::spacingHint() );
+	tqlayout->setMargin( KDialog::marginHint() );
 
 	// add diff options
 	TQVButtonGroup* optionButtonGroup     = new TQVButtonGroup( i18n( "General" ), page );
-	layout->addWidget( optionButtonGroup );
+	tqlayout->addWidget( optionButtonGroup );
 	optionButtonGroup->setMargin( KDialog::marginHint() );
 
 	m_smallerCheckBox     = new TQCheckBox( i18n( "&Look for smaller changes" ), optionButtonGroup );
@@ -278,13 +278,13 @@ void DiffPage::addOptionsTab()
 	m_caseCheckBox        = new TQCheckBox( i18n( "&Ignore changes in case" ), optionButtonGroup );
 	TQToolTip::add( m_caseCheckBox, i18n( "This corresponds to the -i diff option." ) );
 
-	TQHBoxLayout* groupLayout = new TQHBoxLayout( layout, -1, "regexp_horizontal_layout" );
+	TQHBoxLayout* groupLayout = new TQHBoxLayout( tqlayout, -1, "regexp_horizontal_layout" );
 	groupLayout->setMargin( KDialog::marginHint() );
 
 	m_ignoreRegExpCheckBox = new TQCheckBox( i18n( "Ignore regexp:" ), page );
 	TQToolTip::add( m_ignoreRegExpCheckBox, i18n( "This option corresponds to the -I diff option." ) );
 	groupLayout->addWidget( m_ignoreRegExpCheckBox );
-	m_ignoreRegExpEdit = new KLineEdit( TQString::null, page, "regexplineedit" );
+	m_ignoreRegExpEdit = new KLineEdit( TQString(), page, "regexplineedit" );
 	TQToolTip::add( m_ignoreRegExpEdit, i18n( "Add the regular expression here that you want to use\nto ignore lines that match it." ) );
 	groupLayout->addWidget( m_ignoreRegExpEdit );
 
@@ -298,7 +298,7 @@ void DiffPage::addOptionsTab()
 	}
 
 	TQVButtonGroup* moreOptionButtonGroup = new TQVButtonGroup( i18n( "Whitespace" ), page );
-	layout->addWidget( moreOptionButtonGroup );
+	tqlayout->addWidget( moreOptionButtonGroup );
 	moreOptionButtonGroup->setMargin( KDialog::marginHint() );
 
 	m_tabsCheckBox        = new TQCheckBox( i18n( "E&xpand tabs to spaces in output" ), moreOptionButtonGroup );
@@ -312,8 +312,8 @@ void DiffPage::addOptionsTab()
 	m_ignoreTabExpansionCheckBox = new TQCheckBox( i18n( "Igno&re changes due to tab expansion" ), moreOptionButtonGroup );
 	TQToolTip::add( m_ignoreTabExpansionCheckBox, i18n( "This option corresponds to the -E diff option." ) );
 
-	layout->addStretch( 1 );
-	page->setMinimumSize( sizeHintForWidget( page ) );
+	tqlayout->addStretch( 1 );
+	page->setMinimumSize( tqsizeHintForWidget( page ) );
 
 	addTab( page, i18n( "O&ptions" ) );
 }
@@ -321,16 +321,16 @@ void DiffPage::addOptionsTab()
 void DiffPage::addExcludeTab()
 {
 	TQWidget* page = new TQWidget( this );
-	TQVBoxLayout* layout = new TQVBoxLayout( page );
-	layout->setSpacing( KDialog::spacingHint() );
-	layout->setMargin( KDialog::marginHint() );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
+	tqlayout->setSpacing( KDialog::spacingHint() );
+	tqlayout->setMargin( KDialog::marginHint() );
 
 	TQHGroupBox* excludeFilePatternGroupBox = new TQHGroupBox( i18n( "File Pattern to Exclude" ), page );
 	m_excludeFilePatternCheckBox = new TQCheckBox( "", excludeFilePatternGroupBox );
 	TQToolTip::add( m_excludeFilePatternCheckBox, i18n( "If this is checked you can enter a shell pattern in the text box on the right or select entries from the list." ) );
 	m_excludeFilePatternEditListBox = new KEditListBox( excludeFilePatternGroupBox, "exclude_file_pattern_editlistbox", false, KEditListBox::Add|KEditListBox::Remove );
 	TQToolTip::add( m_excludeFilePatternEditListBox, i18n( "Here you can enter or remove a shell pattern or select one or more entries from the list." ) );
-	layout->addWidget( excludeFilePatternGroupBox );
+	tqlayout->addWidget( excludeFilePatternGroupBox );
 
 
 	connect( m_excludeFilePatternCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFilePatternToggled(bool)));
@@ -342,12 +342,12 @@ void DiffPage::addExcludeTab()
 	TQToolTip::add( m_excludeFileURLComboBox, i18n( "Here you can enter the URL of a file with shell patterns to ignore during the comparison of the folders." ) );
 	m_excludeFileURLRequester = new KURLRequester( m_excludeFileURLComboBox, excludeFileNameGroupBox, "exclude_file_name_urlrequester" );
 	TQToolTip::add( m_excludeFileURLRequester, i18n( "Any file you select in the dialog that pops up when you click it will be put in the dialog to the left of this button." ) );
-	layout->addWidget( excludeFileNameGroupBox );
+	tqlayout->addWidget( excludeFileNameGroupBox );
 
 	connect( m_excludeFileCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFileToggled(bool)));
 
-	layout->addStretch( 1 );
-	page->setMinimumSize( sizeHintForWidget( page ) );
+	tqlayout->addStretch( 1 );
+	page->setMinimumSize( tqsizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Exclude" ) );
 }
diff --git a/kompare/libdialogpages/diffpage.h b/kompare/libdialogpages/diffpage.h
index 425d06df..eb0c85c0 100644
--- a/kompare/libdialogpages/diffpage.h
+++ b/kompare/libdialogpages/diffpage.h
@@ -40,6 +40,7 @@ class DiffSettings;
 class DiffPage : public PageBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	DiffPage( TQWidget* );
 	~DiffPage();
diff --git a/kompare/libdialogpages/diffsettings.cpp b/kompare/libdialogpages/diffsettings.cpp
index 6c2186f5..3f7cb1be 100644
--- a/kompare/libdialogpages/diffsettings.cpp
+++ b/kompare/libdialogpages/diffsettings.cpp
@@ -19,8 +19,8 @@
 
 #include "diffsettings.h"
 
-DiffSettings::DiffSettings( TQWidget* parent )
-	: SettingsBase( parent ),
+DiffSettings::DiffSettings( TQWidget* tqparent )
+	: SettingsBase( tqparent ),
 	m_linesOfContext( 0 ),
 	m_format( Kompare::Unified ),
 	m_largeFiles( false ),
diff --git a/kompare/libdialogpages/diffsettings.h b/kompare/libdialogpages/diffsettings.h
index a41308c0..3d219c96 100644
--- a/kompare/libdialogpages/diffsettings.h
+++ b/kompare/libdialogpages/diffsettings.h
@@ -29,8 +29,9 @@
 class DiffSettings : public SettingsBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	DiffSettings( TQWidget* parent );
+	DiffSettings( TQWidget* tqparent );
 	virtual ~DiffSettings();
 public:
 	// some virtual functions that will be overloaded from the base class
diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp
index f326bbde..606f38fe 100644
--- a/kompare/libdialogpages/filespage.cpp
+++ b/kompare/libdialogpages/filespage.cpp
@@ -31,12 +31,12 @@
 #include "filessettings.h"
 #include "filespage.h"
 
-FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( false )
+FilesPage::FilesPage( TQWidget* tqparent ) : PageBase( tqparent ), m_URLChanged( false )
 {
 	TQWidget* page = new TQWidget( this );
-	TQVBoxLayout* layout = new TQVBoxLayout( page );
-	layout->setSpacing( KDialog::spacingHint() );
-	layout->setMargin( KDialog::marginHint() );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
+	tqlayout->setSpacing( KDialog::spacingHint() );
+	tqlayout->setMargin( KDialog::marginHint() );
 
 	m_firstGB = new TQGroupBox( 1, Qt::Vertical, "You have to set this moron :)", page );
 	m_firstURLComboBox = new KURLComboBox( KURLComboBox::Both, true, m_firstGB, "SourceURLComboBox" );
@@ -54,12 +54,12 @@ FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( fal
 	m_encodingComboBox = new TQComboBox( false, m_thirdGB, "encoding_combobox" );
 	m_encodingComboBox->insertStringList( KGlobal::charsets()->availableEncodingNames() );
 
-	layout->addWidget( m_firstGB );
-	layout->addWidget( m_secondGB );
-	layout->addWidget( m_thirdGB );
+	tqlayout->addWidget( m_firstGB );
+	tqlayout->addWidget( m_secondGB );
+	tqlayout->addWidget( m_thirdGB );
 
-	layout->addStretch( 1 );
-	page->setMinimumSize( sizeHintForWidget( page ) );
+	tqlayout->addStretch( 1 );
+	page->setMinimumSize( tqsizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Files" ) );
 }
diff --git a/kompare/libdialogpages/filespage.h b/kompare/libdialogpages/filespage.h
index 08db4238..24380f7c 100644
--- a/kompare/libdialogpages/filespage.h
+++ b/kompare/libdialogpages/filespage.h
@@ -36,8 +36,9 @@ class FilesSettings;
 class FilesPage : PageBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	FilesPage( TQWidget* parent );
+	FilesPage( TQWidget* tqparent );
 	virtual ~FilesPage();
 
 public:
diff --git a/kompare/libdialogpages/filessettings.cpp b/kompare/libdialogpages/filessettings.cpp
index 01b70076..fa982a12 100644
--- a/kompare/libdialogpages/filessettings.cpp
+++ b/kompare/libdialogpages/filessettings.cpp
@@ -21,8 +21,8 @@
 
 #include "filessettings.h"
 
-FilesSettings::FilesSettings( TQWidget* parent )
-	: SettingsBase( parent )
+FilesSettings::FilesSettings( TQWidget* tqparent )
+	: SettingsBase( tqparent )
 {
 }
 
diff --git a/kompare/libdialogpages/filessettings.h b/kompare/libdialogpages/filessettings.h
index e38fff6d..a2e5898b 100644
--- a/kompare/libdialogpages/filessettings.h
+++ b/kompare/libdialogpages/filessettings.h
@@ -28,8 +28,9 @@ class KConfig;
 class FilesSettings : public SettingsBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	FilesSettings( TQWidget* parent );
+	FilesSettings( TQWidget* tqparent );
 	virtual ~FilesSettings();
 
 public:
diff --git a/kompare/libdialogpages/pagebase.cpp b/kompare/libdialogpages/pagebase.cpp
index ef9aa1ea..4feda39b 100644
--- a/kompare/libdialogpages/pagebase.cpp
+++ b/kompare/libdialogpages/pagebase.cpp
@@ -22,7 +22,7 @@
 
 #include "pagebase.h"
 
-PageBase::PageBase( TQWidget* parent ) : KTabCtl( parent )
+PageBase::PageBase( TQWidget* tqparent ) : KTabCtl( tqparent )
 {
 
 }
@@ -33,12 +33,12 @@ PageBase::~PageBase()
 }
 
 /** No descriptions */
-TQSize PageBase::sizeHintForWidget( TQWidget* widget )
+TQSize PageBase::tqsizeHintForWidget( TQWidget* widget )
 {
 	//
-	// The size is computed by adding the sizeHint().height() of all
-	// widget children and taking the width of the widest child and adding
-	// layout()->margin() and layout()->spacing()
+	// The size is computed by adding the tqsizeHint().height() of all
+	// widget tqchildren and taking the width of the widest child and adding
+	// tqlayout()->margin() and tqlayout()->spacing()
 	//
 
 	// this code in this method has been ripped out of a file in kbabel
@@ -47,17 +47,17 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget )
 	TQSize size;
 
 	int numChild = 0;
-	TQObjectList *l = (TQObjectList*)(widget->children());
+	TQObjectList l = widget->childrenListObject();
 
-	for( uint i=0; i < l->count(); i++ )
+	for( uint i=0; i < l.count(); i++ )
 	{
-		TQObject *o = l->at(i);
+		TQObject *o = l.at(i);
 		if( o->isWidgetType() )
 		{
 			numChild += 1;
 			TQWidget *w=((TQWidget*)o);
 
-			TQSize s = w->sizeHint();
+			TQSize s = w->tqsizeHint();
 			if( s.isEmpty() == true )
 			{
 				s = TQSize( 50, 100 ); // Default size
@@ -72,8 +72,8 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget )
 
 	if( numChild > 0 )
 	{
-		size.setHeight( size.height() + widget->layout()->spacing()*(numChild-1) );
-		size += TQSize( widget->layout()->margin()*2, widget->layout()->margin()*2 + 1 );
+		size.setHeight( size.height() + widget->tqlayout()->spacing()*(numChild-1) );
+		size += TQSize( widget->tqlayout()->margin()*2, widget->tqlayout()->margin()*2 + 1 );
 	}
 	else
 	{
diff --git a/kompare/libdialogpages/pagebase.h b/kompare/libdialogpages/pagebase.h
index 0f188b36..32d4bca3 100644
--- a/kompare/libdialogpages/pagebase.h
+++ b/kompare/libdialogpages/pagebase.h
@@ -31,13 +31,14 @@
 class PageBase : public KTabCtl
 {
 Q_OBJECT
+  TQ_OBJECT
 public: 
 	PageBase( TQWidget* );
 	~PageBase();
 
 public:
 	/** No descriptions */
-	TQSize        sizeHintForWidget( TQWidget* widget );
+	TQSize        tqsizeHintForWidget( TQWidget* widget );
 	/** No descriptions */
 	virtual void restore();
 	/** No descriptions */
diff --git a/kompare/libdialogpages/settingsbase.cpp b/kompare/libdialogpages/settingsbase.cpp
index 6e347719..36f70a1b 100644
--- a/kompare/libdialogpages/settingsbase.cpp
+++ b/kompare/libdialogpages/settingsbase.cpp
@@ -21,7 +21,7 @@
 
 #include "settingsbase.h"
 
-SettingsBase::SettingsBase( TQWidget* parent ) : TQObject( parent )
+SettingsBase::SettingsBase( TQWidget* tqparent ) : TQObject( tqparent )
 {
 
 }
diff --git a/kompare/libdialogpages/settingsbase.h b/kompare/libdialogpages/settingsbase.h
index 4bbe13b5..79e556cc 100644
--- a/kompare/libdialogpages/settingsbase.h
+++ b/kompare/libdialogpages/settingsbase.h
@@ -27,11 +27,12 @@
 class TQWidget;
 class KConfig;
 
-class SettingsBase : public QObject
+class SettingsBase : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	SettingsBase( TQWidget* parent );
+	SettingsBase( TQWidget* tqparent );
 	~SettingsBase();
 
 public:
diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp
index 1deb9e21..d78f6b9a 100644
--- a/kompare/libdialogpages/viewpage.cpp
+++ b/kompare/libdialogpages/viewpage.cpp
@@ -33,48 +33,48 @@
 #include "viewpage.h"
 #include "viewsettings.h"
 
-ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
+ViewPage::ViewPage( TQWidget* tqparent ) : PageBase( tqparent )
 {
 	TQWidget*     page;
-	TQVBoxLayout* layout;
-	TQGroupBox*   colorGroupBox;
+	TQVBoxLayout* tqlayout;
+	TQGroupBox*   tqcolorGroupBox;
 	TQHGroupBox*  snolGroupBox;
 	TQHGroupBox*  tabGroupBox;
 	TQLabel*      label;
 
 	page   = new TQWidget( this );
-	layout = new TQVBoxLayout( page );
-	layout->setSpacing( KDialog::spacingHint() );
-	layout->setMargin( KDialog::marginHint() );
+	tqlayout = new TQVBoxLayout( page );
+	tqlayout->setSpacing( KDialog::spacingHint() );
+	tqlayout->setMargin( KDialog::marginHint() );
 
 	// add a groupbox
-	colorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page );
-	layout->addWidget( colorGroupBox );
-	colorGroupBox->setMargin( KDialog::marginHint() );
+	tqcolorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page );
+	tqlayout->addWidget( tqcolorGroupBox );
+	tqcolorGroupBox->setMargin( KDialog::marginHint() );
 
 	// add the removeColor
-	label = new TQLabel( i18n( "Removed color:" ), colorGroupBox );
-	m_removedColorButton = new KColorButton( colorGroupBox );
+	label = new TQLabel( i18n( "Removed color:" ), tqcolorGroupBox );
+	m_removedColorButton = new KColorButton( tqcolorGroupBox );
 	label->setBuddy( m_removedColorButton );
 
 	// add the changeColor
-	label = new TQLabel( i18n( "Changed color:" ), colorGroupBox );
-	m_changedColorButton = new KColorButton( colorGroupBox );
+	label = new TQLabel( i18n( "Changed color:" ), tqcolorGroupBox );
+	m_changedColorButton = new KColorButton( tqcolorGroupBox );
 	label->setBuddy( m_changedColorButton );
 
 	// add the addColor
-	label = new TQLabel( i18n( "Added color:" ), colorGroupBox );
-	m_addedColorButton = new KColorButton( colorGroupBox );
+	label = new TQLabel( i18n( "Added color:" ), tqcolorGroupBox );
+	m_addedColorButton = new KColorButton( tqcolorGroupBox );
 	label->setBuddy( m_addedColorButton );
 
 	// add the appliedColor
-	label = new TQLabel( i18n( "Applied color:" ), colorGroupBox );
-	m_appliedColorButton = new KColorButton( colorGroupBox );
+	label = new TQLabel( i18n( "Applied color:" ), tqcolorGroupBox );
+	m_appliedColorButton = new KColorButton( tqcolorGroupBox );
 	label->setBuddy( m_appliedColorButton );
 
 	// scroll number of lines (snol)
 	snolGroupBox = new TQHGroupBox( i18n( "Mouse Wheel" ), page );
-	layout->addWidget( snolGroupBox );
+	tqlayout->addWidget( snolGroupBox );
 	snolGroupBox->setMargin( KDialog::marginHint() );
 
 	label            = new TQLabel( i18n( "Number of lines:" ), snolGroupBox );
@@ -84,25 +84,25 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
 	// Temporarily here for testing...
 	// number of spaces for a tab character stuff
 	tabGroupBox = new TQHGroupBox( i18n( "Tabs to Spaces" ), page );
-	layout->addWidget( tabGroupBox );
+	tqlayout->addWidget( tabGroupBox );
 	tabGroupBox->setMargin( KDialog::marginHint() );
 
 	label = new TQLabel( i18n( "Number of spaces to convert a tab character to:" ), tabGroupBox );
 	m_tabSpinBox = new TQSpinBox( 1, 16, 1, tabGroupBox );
 	label->setBuddy( m_tabSpinBox );
 
-	layout->addStretch( 1 );
-	page->setMinimumSize( sizeHintForWidget( page ) );
+	tqlayout->addStretch( 1 );
+	page->setMinimumSize( tqsizeHintForWidget( page ) );
 
 	addTab( page, i18n( "A&ppearance" ) );
 
 	page   = new TQWidget( this );
-	layout = new TQVBoxLayout( page );
-	layout->setSpacing( KDialog::spacingHint() );
-	layout->setMargin( KDialog::marginHint() );
+	tqlayout = new TQVBoxLayout( page );
+	tqlayout->setSpacing( KDialog::spacingHint() );
+	tqlayout->setMargin( KDialog::marginHint() );
 
 	TQHGroupBox* gb = new TQHGroupBox( i18n( "Text Font" ), page );
-	layout->addWidget( gb );
+	tqlayout->addWidget( gb );
 	gb->setMargin( KDialog::marginHint() );
 
 	label = new TQLabel( i18n( "Font:" ), gb );
@@ -113,8 +113,8 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
 	m_fontSizeSpinBox = new TQSpinBox( 6, 24, 1, gb, "fontsize" );
 	label->setBuddy( m_fontSizeSpinBox );
 
-	layout->addStretch( 1 );
-	page->setMinimumSize( sizeHintForWidget( page ) );
+	tqlayout->addStretch( 1 );
+	page->setMinimumSize( tqsizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Fonts" ) );
 }
diff --git a/kompare/libdialogpages/viewpage.h b/kompare/libdialogpages/viewpage.h
index 8682f268..75a6e335 100644
--- a/kompare/libdialogpages/viewpage.h
+++ b/kompare/libdialogpages/viewpage.h
@@ -33,6 +33,7 @@ class ViewSettings;
 class ViewPage : public PageBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	ViewPage( TQWidget* );
 	~ViewPage();
diff --git a/kompare/libdialogpages/viewsettings.cpp b/kompare/libdialogpages/viewsettings.cpp
index 403746b1..8e61117e 100644
--- a/kompare/libdialogpages/viewsettings.cpp
+++ b/kompare/libdialogpages/viewsettings.cpp
@@ -31,8 +31,8 @@ const TQColor ViewSettings::default_changeColor (237, 190, 190);
 const TQColor ViewSettings::default_addColor    (190, 190, 237);
 const TQColor ViewSettings::default_appliedColor(237, 237, 190);
 
-ViewSettings::ViewSettings( TQWidget* parent )
-	: SettingsBase( parent ),
+ViewSettings::ViewSettings( TQWidget* tqparent )
+	: SettingsBase( tqparent ),
 	m_removeColor( 0, 0, 0 ),
 	m_changeColor( 0, 0, 0),
 	m_addColor( 0, 0, 0),
diff --git a/kompare/libdialogpages/viewsettings.h b/kompare/libdialogpages/viewsettings.h
index 24bf8e9a..c7a2cfd5 100644
--- a/kompare/libdialogpages/viewsettings.h
+++ b/kompare/libdialogpages/viewsettings.h
@@ -29,13 +29,14 @@
 class ViewSettings : public SettingsBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	static const TQColor default_removeColor;
 	static const TQColor default_changeColor;
 	static const TQColor default_addColor;
 	static const TQColor default_appliedColor;
 
-	ViewSettings( TQWidget* parent );
+	ViewSettings( TQWidget* tqparent );
 	~ViewSettings();
 public:
 	// some virtual functions that will be overloaded from the base class