Trinity Qt initial conversion

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

16 files changed, 221 insertions, 221 deletions

diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp
index 7f805c5b..0423f1a5 100644
--- a/kompare/libdialogpages/diffpage.cpp
+++ b/kompare/libdialogpages/diffpage.cpp
@@ -15,15 +15,15 @@
 **
 ***************************************************************************/
 
-#include <qcheckbox.h>
-#include <qhgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qradiobutton.h>
-#include <qspinbox.h>
-#include <qtooltip.h>
-#include <qvbuttongroup.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqhgroupbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqradiobutton.h>
+#include <tqspinbox.h>
+#include <tqtooltip.h>
+#include <tqvbuttongroup.h>
+#include <tqwhatsthis.h>
 
 #include <kapplication.h>
 #include <kcombobox.h>
@@ -42,7 +42,7 @@
 
 #include "diffpage.h"
 
-DiffPage::DiffPage( QWidget* parent ) : PageBase( parent ),
+DiffPage::DiffPage( TQWidget* parent ) : PageBase( parent ),
 	m_ignoreRegExpDialog( 0 )
 {
 	addDiffTab();
@@ -146,7 +146,7 @@ void DiffPage::setDefaults()
 	m_ignoreTabExpansionCheckBox->setChecked( false );
 	m_ignoreRegExpCheckBox->setChecked( false );
 
-	m_ignoreRegExpEdit->setText( QString::null );
+	m_ignoreRegExpEdit->setText( TQString::null );
 
 	m_locSpinBox->setValue( 3 );
 
@@ -160,7 +160,7 @@ void DiffPage::setDefaults()
 void DiffPage::slotShowRegExpEditor()
 {
 	if ( ! m_ignoreRegExpDialog )
-		m_ignoreRegExpDialog = KParts::ComponentFactory::createInstanceFromQuery<QDialog>( "KRegExpEditor/KRegExpEditor", QString::null, this );
+		m_ignoreRegExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString::null, this );
 
 	KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( m_ignoreRegExpDialog->qt_cast( "KRegExpEditorInterface" ) );
 
@@ -202,18 +202,18 @@ void DiffPage::slotExcludeFileToggled( bool on )
 
 void DiffPage::addDiffTab()
 {
-	QWidget* page   = new QWidget( this );
-	QVBoxLayout* layout = new QVBoxLayout( page );
+	TQWidget* page   = new TQWidget( this );
+	TQVBoxLayout* layout = new TQVBoxLayout( page );
 	layout->setSpacing( KDialog::spacingHint() );
 	layout->setMargin( KDialog::marginHint() );
 
 	// add diff program selector
-	m_diffProgramGroup = new QVButtonGroup( i18n( "Diff Program" ), page );
+	m_diffProgramGroup = new TQVButtonGroup( i18n( "Diff Program" ), page );
 	layout->addWidget( m_diffProgramGroup );
 	m_diffProgramGroup->setMargin( KDialog::marginHint() );
 
 	m_diffURLRequester = new KURLRequester( m_diffProgramGroup, "diffURLRequester" );
-	QWhatsThis::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." ) );
+	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 ) );
@@ -223,34 +223,34 @@ void DiffPage::addDiffTab()
 
 void DiffPage::addFormatTab()
 {
-	QWidget* page   = new QWidget( this );
-	QVBoxLayout* layout = new QVBoxLayout( page );
+	TQWidget* page   = new TQWidget( this );
+	TQVBoxLayout* layout = new TQVBoxLayout( page );
 	layout->setSpacing( KDialog::spacingHint() );
 	layout->setMargin( KDialog::marginHint() );
 
 	// add diff modes
-	m_modeButtonGroup = new QVButtonGroup( i18n( "Output Format" ), page );
-	QWhatsThis::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." ) );
+	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 );
 	m_modeButtonGroup->setMargin( KDialog::marginHint() );
 
-	QRadioButton* radioButton;
-	radioButton = new QRadioButton( i18n( "Context" ), m_modeButtonGroup );
-	radioButton = new QRadioButton( i18n( "Ed" ),      m_modeButtonGroup );
+	TQRadioButton* radioButton;
+	radioButton = new TQRadioButton( i18n( "Context" ), m_modeButtonGroup );
+	radioButton = new TQRadioButton( i18n( "Ed" ),      m_modeButtonGroup );
 	radioButton->setEnabled( false );
-	radioButton = new QRadioButton( i18n( "Normal" ),  m_modeButtonGroup );
-	radioButton = new QRadioButton( i18n( "RCS" ),     m_modeButtonGroup );
+	radioButton = new TQRadioButton( i18n( "Normal" ),  m_modeButtonGroup );
+	radioButton = new TQRadioButton( i18n( "RCS" ),     m_modeButtonGroup );
 	radioButton->setEnabled( false );
-	radioButton = new QRadioButton( i18n( "Unified" ), m_modeButtonGroup );
+	radioButton = new TQRadioButton( i18n( "Unified" ), m_modeButtonGroup );
 
 	// #lines of context (loc)
-	QHGroupBox* groupBox = new QHGroupBox( i18n( "Lines of Context" ), page );
+	TQHGroupBox* groupBox = new TQHGroupBox( i18n( "Lines of Context" ), page );
 	layout->addWidget( groupBox );
 	groupBox->setMargin( KDialog::marginHint() );
 
-	QLabel* label = new QLabel( i18n( "Number of context lines:" ), groupBox );
-	m_locSpinBox = new QSpinBox( 0, 100, 1, groupBox );
-	QWhatsThis::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." ) );
+	TQLabel* label = new TQLabel( i18n( "Number of context lines:" ), groupBox );
+	m_locSpinBox = new TQSpinBox( 0, 100, 1, groupBox );
+	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 );
@@ -261,56 +261,56 @@ void DiffPage::addFormatTab()
 
 void DiffPage::addOptionsTab()
 {
-	QWidget* page   = new QWidget( this );
-	QVBoxLayout* layout = new QVBoxLayout( page );
+	TQWidget* page   = new TQWidget( this );
+	TQVBoxLayout* layout = new TQVBoxLayout( page );
 	layout->setSpacing( KDialog::spacingHint() );
 	layout->setMargin( KDialog::marginHint() );
 
 	// add diff options
-	QVButtonGroup* optionButtonGroup     = new QVButtonGroup( i18n( "General" ), page );
+	TQVButtonGroup* optionButtonGroup     = new TQVButtonGroup( i18n( "General" ), page );
 	layout->addWidget( optionButtonGroup );
 	optionButtonGroup->setMargin( KDialog::marginHint() );
 
-	m_smallerCheckBox     = new QCheckBox( i18n( "&Look for smaller changes" ), optionButtonGroup );
-	QToolTip::add( m_smallerCheckBox, i18n( "This corresponds to the -d diff option." ) );
-	m_largerCheckBox      = new QCheckBox( i18n( "O&ptimize for large files" ), optionButtonGroup );
-	QToolTip::add( m_largerCheckBox, i18n( "This corresponds to the -H diff option." ) );
-	m_caseCheckBox        = new QCheckBox( i18n( "&Ignore changes in case" ), optionButtonGroup );
-	QToolTip::add( m_caseCheckBox, i18n( "This corresponds to the -i diff option." ) );
+	m_smallerCheckBox     = new TQCheckBox( i18n( "&Look for smaller changes" ), optionButtonGroup );
+	TQToolTip::add( m_smallerCheckBox, i18n( "This corresponds to the -d diff option." ) );
+	m_largerCheckBox      = new TQCheckBox( i18n( "O&ptimize for large files" ), optionButtonGroup );
+	TQToolTip::add( m_largerCheckBox, i18n( "This corresponds to the -H diff option." ) );
+	m_caseCheckBox        = new TQCheckBox( i18n( "&Ignore changes in case" ), optionButtonGroup );
+	TQToolTip::add( m_caseCheckBox, i18n( "This corresponds to the -i diff option." ) );
 
-	QHBoxLayout* groupLayout = new QHBoxLayout( layout, -1, "regexp_horizontal_layout" );
+	TQHBoxLayout* groupLayout = new TQHBoxLayout( layout, -1, "regexp_horizontal_layout" );
 	groupLayout->setMargin( KDialog::marginHint() );
 
-	m_ignoreRegExpCheckBox = new QCheckBox( i18n( "Ignore regexp:" ), page );
-	QToolTip::add( m_ignoreRegExpCheckBox, i18n( "This option corresponds to the -I diff option." ) );
+	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( QString::null, page, "regexplineedit" );
-	QToolTip::add( m_ignoreRegExpEdit, i18n( "Add the regular expression here that you want to use\nto ignore lines that match it." ) );
+	m_ignoreRegExpEdit = new KLineEdit( TQString::null, 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 );
 
 	if ( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() )
 	{
 		// Ok editor is available, use it
-		QButton* ignoreRegExpEditButton = new QPushButton( i18n( "&Edit..." ), page, "regexp_editor_button" );
-		QToolTip::add( ignoreRegExpEditButton, i18n( "Clicking this will open a regular expression dialog where\nyou can graphically create regular expressions." ) );
+		TQButton* ignoreRegExpEditButton = new TQPushButton( i18n( "&Edit..." ), page, "regexp_editor_button" );
+		TQToolTip::add( ignoreRegExpEditButton, i18n( "Clicking this will open a regular expression dialog where\nyou can graphically create regular expressions." ) );
 		groupLayout->addWidget( ignoreRegExpEditButton );
-		connect( ignoreRegExpEditButton, SIGNAL( clicked() ), this, SLOT( slotShowRegExpEditor() ) );
+		connect( ignoreRegExpEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowRegExpEditor() ) );
 	}
 
-	QVButtonGroup* moreOptionButtonGroup = new QVButtonGroup( i18n( "Whitespace" ), page );
+	TQVButtonGroup* moreOptionButtonGroup = new TQVButtonGroup( i18n( "Whitespace" ), page );
 	layout->addWidget( moreOptionButtonGroup );
 	moreOptionButtonGroup->setMargin( KDialog::marginHint() );
 
-	m_tabsCheckBox        = new QCheckBox( i18n( "E&xpand tabs to spaces in output" ), moreOptionButtonGroup );
-	QToolTip::add( m_tabsCheckBox, i18n( "This option corresponds to the -t diff option." ) );
-	m_linesCheckBox       = new QCheckBox( i18n( "I&gnore added or removed empty lines" ), moreOptionButtonGroup );
-	QToolTip::add( m_linesCheckBox, i18n( "This option corresponds to the -B diff option." ) );
-	m_whitespaceCheckBox  = new QCheckBox( i18n( "Ig&nore changes in the amount of whitespace" ), moreOptionButtonGroup );
-	QToolTip::add( m_whitespaceCheckBox, i18n( "This option corresponds to the -b diff option." ) );
-	m_allWhitespaceCheckBox = new QCheckBox( i18n( "Ign&ore all whitespace" ), moreOptionButtonGroup );
-	QToolTip::add( m_allWhitespaceCheckBox, i18n( "This option corresponds to the -w diff option." ) );
-	m_ignoreTabExpansionCheckBox = new QCheckBox( i18n( "Igno&re changes due to tab expansion" ), moreOptionButtonGroup );
-	QToolTip::add( m_ignoreTabExpansionCheckBox, i18n( "This option corresponds to the -E diff option." ) );
+	m_tabsCheckBox        = new TQCheckBox( i18n( "E&xpand tabs to spaces in output" ), moreOptionButtonGroup );
+	TQToolTip::add( m_tabsCheckBox, i18n( "This option corresponds to the -t diff option." ) );
+	m_linesCheckBox       = new TQCheckBox( i18n( "I&gnore added or removed empty lines" ), moreOptionButtonGroup );
+	TQToolTip::add( m_linesCheckBox, i18n( "This option corresponds to the -B diff option." ) );
+	m_whitespaceCheckBox  = new TQCheckBox( i18n( "Ig&nore changes in the amount of whitespace" ), moreOptionButtonGroup );
+	TQToolTip::add( m_whitespaceCheckBox, i18n( "This option corresponds to the -b diff option." ) );
+	m_allWhitespaceCheckBox = new TQCheckBox( i18n( "Ign&ore all whitespace" ), moreOptionButtonGroup );
+	TQToolTip::add( m_allWhitespaceCheckBox, i18n( "This option corresponds to the -w diff option." ) );
+	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 ) );
@@ -320,31 +320,31 @@ void DiffPage::addOptionsTab()
 
 void DiffPage::addExcludeTab()
 {
-	QWidget* page = new QWidget( this );
-	QVBoxLayout* layout = new QVBoxLayout( page );
+	TQWidget* page = new TQWidget( this );
+	TQVBoxLayout* layout = new TQVBoxLayout( page );
 	layout->setSpacing( KDialog::spacingHint() );
 	layout->setMargin( KDialog::marginHint() );
 
-	QHGroupBox* excludeFilePatternGroupBox = new QHGroupBox( i18n( "File Pattern to Exclude" ), page );
-	m_excludeFilePatternCheckBox = new QCheckBox( "", excludeFilePatternGroupBox );
-	QToolTip::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." ) );
+	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 );
-	QToolTip::add( m_excludeFilePatternEditListBox, i18n( "Here you can enter or remove a shell pattern or select one or more entries from the list." ) );
+	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 );
 
 
-	connect( m_excludeFilePatternCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotExcludeFilePatternToggled(bool)));
+	connect( m_excludeFilePatternCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFilePatternToggled(bool)));
 
-	QHGroupBox* excludeFileNameGroupBox = new QHGroupBox( i18n( "File with Filenames to Exclude" ), page );
-	m_excludeFileCheckBox     = new QCheckBox( "", excludeFileNameGroupBox );
-	QToolTip::add( m_excludeFileCheckBox, i18n( "If this is checked you can enter a filename in the combo box on the right." ) );
+	TQHGroupBox* excludeFileNameGroupBox = new TQHGroupBox( i18n( "File with Filenames to Exclude" ), page );
+	m_excludeFileCheckBox     = new TQCheckBox( "", excludeFileNameGroupBox );
+	TQToolTip::add( m_excludeFileCheckBox, i18n( "If this is checked you can enter a filename in the combo box on the right." ) );
 	m_excludeFileURLComboBox  = new KURLComboBox( KURLComboBox::Files, true, excludeFileNameGroupBox, "exclude_file_urlcombo" );
-	QToolTip::add( m_excludeFileURLComboBox, i18n( "Here you can enter the URL of a file with shell patterns to ignore during the comparison of the folders." ) );
+	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" );
-	QToolTip::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." ) );
+	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 );
 
-	connect( m_excludeFileCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotExcludeFileToggled(bool)));
+	connect( m_excludeFileCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFileToggled(bool)));
 
 	layout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
diff --git a/kompare/libdialogpages/diffpage.h b/kompare/libdialogpages/diffpage.h
index dee23989..9a8e1fdc 100644
--- a/kompare/libdialogpages/diffpage.h
+++ b/kompare/libdialogpages/diffpage.h
@@ -41,7 +41,7 @@ class DiffPage : public PageBase
 {
 Q_OBJECT
 public:
-	DiffPage( QWidget* );
+	DiffPage( TQWidget* );
 	~DiffPage();
 
 public:
@@ -69,32 +69,32 @@ public:
 
 	KURLRequester* m_diffURLRequester;
 
-	QCheckBox*     m_smallerCheckBox;
-	QCheckBox*     m_largerCheckBox;
-	QCheckBox*     m_tabsCheckBox;
-	QCheckBox*     m_caseCheckBox;
-	QCheckBox*     m_linesCheckBox;
-	QCheckBox*     m_whitespaceCheckBox;
-	QCheckBox*     m_allWhitespaceCheckBox;
-	QCheckBox*     m_ignoreTabExpansionCheckBox;
+	TQCheckBox*     m_smallerCheckBox;
+	TQCheckBox*     m_largerCheckBox;
+	TQCheckBox*     m_tabsCheckBox;
+	TQCheckBox*     m_caseCheckBox;
+	TQCheckBox*     m_linesCheckBox;
+	TQCheckBox*     m_whitespaceCheckBox;
+	TQCheckBox*     m_allWhitespaceCheckBox;
+	TQCheckBox*     m_ignoreTabExpansionCheckBox;
 
-	QCheckBox*     m_ignoreRegExpCheckBox;
+	TQCheckBox*     m_ignoreRegExpCheckBox;
 	KLineEdit*     m_ignoreRegExpEdit;
-	QStringList*   m_ignoreRegExpEditHistory;
-	QDialog*       m_ignoreRegExpDialog;
+	TQStringList*   m_ignoreRegExpEditHistory;
+	TQDialog*       m_ignoreRegExpDialog;
 
-	QCheckBox*     m_excludeFilePatternCheckBox;
+	TQCheckBox*     m_excludeFilePatternCheckBox;
 	KEditListBox*  m_excludeFilePatternEditListBox;
 	
-	QCheckBox*     m_excludeFileCheckBox;
+	TQCheckBox*     m_excludeFileCheckBox;
 	KURLComboBox*  m_excludeFileURLComboBox;
 	KURLRequester* m_excludeFileURLRequester;
 
 	// loc == lines of context
-	QSpinBox*      m_locSpinBox;
+	TQSpinBox*      m_locSpinBox;
 
-	QVButtonGroup* m_modeButtonGroup;
-	QVButtonGroup* m_diffProgramGroup;
+	TQVButtonGroup* m_modeButtonGroup;
+	TQVButtonGroup* m_diffProgramGroup;
 };
 
 #endif
diff --git a/kompare/libdialogpages/diffsettings.cpp b/kompare/libdialogpages/diffsettings.cpp
index 20504ffe..6c2186f5 100644
--- a/kompare/libdialogpages/diffsettings.cpp
+++ b/kompare/libdialogpages/diffsettings.cpp
@@ -19,7 +19,7 @@
 
 #include "diffsettings.h"
 
-DiffSettings::DiffSettings( QWidget* parent )
+DiffSettings::DiffSettings( TQWidget* parent )
 	: SettingsBase( parent ),
 	m_linesOfContext( 0 ),
 	m_format( Kompare::Unified ),
diff --git a/kompare/libdialogpages/diffsettings.h b/kompare/libdialogpages/diffsettings.h
index 46962cb8..a41308c0 100644
--- a/kompare/libdialogpages/diffsettings.h
+++ b/kompare/libdialogpages/diffsettings.h
@@ -20,8 +20,8 @@
 #ifndef DIFFSETTINGS_H
 #define DIFFSETTINGS_H
 
-#include <qstringlist.h>
-#include <qwidget.h>
+#include <tqstringlist.h>
+#include <tqwidget.h>
 
 #include "kompare.h"
 #include "settingsbase.h"
@@ -30,7 +30,7 @@ class DiffSettings : public SettingsBase
 {
 Q_OBJECT
 public:
-	DiffSettings( QWidget* parent );
+	DiffSettings( TQWidget* parent );
 	virtual ~DiffSettings();
 public:
 	// some virtual functions that will be overloaded from the base class
@@ -38,7 +38,7 @@ public:
 	virtual void saveSettings( KConfig* config );
 
 public:
-	QString m_diffProgram;
+	TQString m_diffProgram;
 	int m_linesOfContext;
 	Kompare::Format m_format;
 	bool m_largeFiles;                           // -H
@@ -51,16 +51,16 @@ public:
 	bool m_showCFunctionChange;                  // -p
 	bool m_convertTabsToSpaces;                  // -t
 	bool m_ignoreRegExp;                         // -I
-	QString m_ignoreRegExpText;                  // the RE for -I
-	QStringList m_ignoreRegExpTextHistory;
+	TQString m_ignoreRegExpText;                  // the RE for -I
+	TQStringList m_ignoreRegExpTextHistory;
 	bool m_recursive;                            // -r
 	bool m_newFiles;                             // -N
 //	bool m_allText;                              // -a
 	bool m_excludeFilePattern;                   // -x
-	QStringList m_excludeFilePatternList;        // The list of patterns for -x
+	TQStringList m_excludeFilePatternList;        // The list of patterns for -x
 	bool m_excludeFilesFile;                     // -X
-	QString m_excludeFilesFileURL;               // The filename to -X
-	QStringList m_excludeFilesFileHistoryList;   // The history list of filenames
+	TQString m_excludeFilesFileURL;               // The filename to -X
+	TQStringList m_excludeFilesFileHistoryList;   // The history list of filenames
 };
 
 #endif
diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp
index 9e15a129..f326bbde 100644
--- a/kompare/libdialogpages/filespage.cpp
+++ b/kompare/libdialogpages/filespage.cpp
@@ -16,8 +16,8 @@
 **
 ***************************************************************************/
 
-#include <qlayout.h>
-#include <qgroupbox.h>
+#include <tqlayout.h>
+#include <tqgroupbox.h>
 
 #include <kapplication.h>
 #include <kcharsets.h>
@@ -31,27 +31,27 @@
 #include "filessettings.h"
 #include "filespage.h"
 
-FilesPage::FilesPage( QWidget* parent ) : PageBase( parent ), m_URLChanged( false )
+FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( false )
 {
-	QWidget* page = new QWidget( this );
-	QVBoxLayout* layout = new QVBoxLayout( page );
+	TQWidget* page = new TQWidget( this );
+	TQVBoxLayout* layout = new TQVBoxLayout( page );
 	layout->setSpacing( KDialog::spacingHint() );
 	layout->setMargin( KDialog::marginHint() );
 
-	m_firstGB = new QGroupBox( 1, Qt::Vertical, "You have to set this moron :)", page );
+	m_firstGB = new TQGroupBox( 1, Qt::Vertical, "You have to set this moron :)", page );
 	m_firstURLComboBox = new KURLComboBox( KURLComboBox::Both, true, m_firstGB, "SourceURLComboBox" );
 	m_firstURLRequester = new KURLRequester( m_firstURLComboBox, m_firstGB );
 	m_firstURLRequester->setFocus();
 
-	m_secondGB = new QGroupBox( 1, Qt::Vertical, "This too moron !", page );
+	m_secondGB = new TQGroupBox( 1, Qt::Vertical, "This too moron !", page );
 	m_secondURLComboBox = new KURLComboBox( KURLComboBox::Both, true, m_secondGB, "DestURLComboBox" );
 	m_secondURLRequester = new KURLRequester( m_secondURLComboBox, m_secondGB );
 
-	connect( m_firstURLRequester, SIGNAL( urlSelected( const QString & ) ), SLOT( setSecondURL( const QString & ) ) );
-	connect( m_secondURLRequester, SIGNAL( urlSelected( const QString & ) ), SLOT( setFirstURL( const QString & ) ) );
+	connect( m_firstURLRequester, TQT_SIGNAL( urlSelected( const TQString & ) ), TQT_SLOT( setSecondURL( const TQString & ) ) );
+	connect( m_secondURLRequester, TQT_SIGNAL( urlSelected( const TQString & ) ), TQT_SLOT( setFirstURL( const TQString & ) ) );
 
-	m_thirdGB = new QGroupBox( 1, Qt::Vertical, i18n( "Encoding" ), page );
-	m_encodingComboBox = new QComboBox( false, m_thirdGB, "encoding_combobox" );
+	m_thirdGB = new TQGroupBox( 1, Qt::Vertical, i18n( "Encoding" ), page );
+	m_encodingComboBox = new TQComboBox( false, m_thirdGB, "encoding_combobox" );
 	m_encodingComboBox->insertStringList( KGlobal::charsets()->availableEncodingNames() );
 
 	layout->addWidget( m_firstGB );
@@ -79,17 +79,17 @@ KURLRequester* FilesPage::secondURLRequester() const
 	return m_secondURLRequester;
 }
 
-QString FilesPage::encoding() const
+TQString FilesPage::encoding() const
 {
 	return m_encodingComboBox->currentText();
 }
 
-void FilesPage::setFirstGroupBoxTitle( const QString& title )
+void FilesPage::setFirstGroupBoxTitle( const TQString& title )
 {
 	m_firstGB->setTitle( title );
 }
 
-void FilesPage::setSecondGroupBoxTitle( const QString& title )
+void FilesPage::setSecondGroupBoxTitle( const TQString& title )
 {
 	m_secondGB->setTitle( title );
 }
@@ -147,9 +147,9 @@ void FilesPage::setDefaults()
 	m_encodingComboBox->setCurrentText( "Default" );
 }
 
-void FilesPage::setFirstURL( const QString &url )
+void FilesPage::setFirstURL( const TQString &url )
 {
-	QString _url = url;
+	TQString _url = url;
 	if ( !m_URLChanged )
 	{
 		m_firstURLRequester->setURL( _url.remove( url.section( '/', -1 ) ) );
@@ -157,9 +157,9 @@ void FilesPage::setFirstURL( const QString &url )
 	}
 }
 
-void FilesPage::setSecondURL( const QString &url )
+void FilesPage::setSecondURL( const TQString &url )
 {
-	QString _url = url;
+	TQString _url = url;
 	if ( !m_URLChanged )
 	{
 		m_secondURLRequester->setURL( _url.remove( url.section( '/', -1 ) ) );
diff --git a/kompare/libdialogpages/filespage.h b/kompare/libdialogpages/filespage.h
index 145c4614..db4347b8 100644
--- a/kompare/libdialogpages/filespage.h
+++ b/kompare/libdialogpages/filespage.h
@@ -37,17 +37,17 @@ class FilesPage : PageBase
 {
 Q_OBJECT
 public:
-	FilesPage( QWidget* parent );
+	FilesPage( TQWidget* parent );
 	virtual ~FilesPage();
 
 public:
 	KURLRequester* firstURLRequester() const;
 	KURLRequester* secondURLRequester() const;
 
-	QString encoding() const;
+	TQString encoding() const;
 
-	void setFirstGroupBoxTitle ( const QString& title );
-	void setSecondGroupBoxTitle( const QString& title );
+	void setFirstGroupBoxTitle ( const TQString& title );
+	void setSecondGroupBoxTitle( const TQString& title );
 
 	void setURLsInComboBoxes();
 
@@ -61,13 +61,13 @@ public:
 	virtual void setDefaults();
 
 protected slots:
-	void setFirstURL( const QString & );
-	void setSecondURL( const QString & );
+	void setFirstURL( const TQString & );
+	void setSecondURL( const TQString & );
 
 private:
-	QGroupBox*     m_firstGB;
-	QGroupBox*     m_secondGB;
-	QGroupBox*     m_thirdGB;
+	TQGroupBox*     m_firstGB;
+	TQGroupBox*     m_secondGB;
+	TQGroupBox*     m_thirdGB;
 	KURLComboBox*  m_firstURLComboBox;
 	KURLComboBox*  m_secondURLComboBox;
 	KURLRequester* m_firstURLRequester;
@@ -75,7 +75,7 @@ private:
 	// Use this bool to lock the connection between both KURLRequesters.
 	// This prevents annoying behaviour
 	bool           m_URLChanged;
-	QComboBox*     m_encodingComboBox;
+	TQComboBox*     m_encodingComboBox;
 
 	FilesSettings* m_settings;
 };
diff --git a/kompare/libdialogpages/filessettings.cpp b/kompare/libdialogpages/filessettings.cpp
index d5a94a66..01b70076 100644
--- a/kompare/libdialogpages/filessettings.cpp
+++ b/kompare/libdialogpages/filessettings.cpp
@@ -21,7 +21,7 @@
 
 #include "filessettings.h"
 
-FilesSettings::FilesSettings( QWidget* parent )
+FilesSettings::FilesSettings( TQWidget* parent )
 	: SettingsBase( parent )
 {
 }
@@ -52,7 +52,7 @@ void FilesSettings::saveSettings( KConfig* config )
 	config->sync();
 }
 
-void FilesSettings::setGroup( const QString& groupName )
+void FilesSettings::setGroup( const TQString& groupName )
 {
 	m_configGroupName = groupName;
 }
diff --git a/kompare/libdialogpages/filessettings.h b/kompare/libdialogpages/filessettings.h
index 3c394dbb..e38fff6d 100644
--- a/kompare/libdialogpages/filessettings.h
+++ b/kompare/libdialogpages/filessettings.h
@@ -19,7 +19,7 @@
 #ifndef FILESSETTINGS_H
 #define FILESSETTINGS_H
 
-#include <qstring.h>
+#include <tqstring.h>
 
 #include "settingsbase.h"
 
@@ -29,7 +29,7 @@ class FilesSettings : public SettingsBase
 {
 Q_OBJECT
 public:
-	FilesSettings( QWidget* parent );
+	FilesSettings( TQWidget* parent );
 	virtual ~FilesSettings();
 
 public:
@@ -37,16 +37,16 @@ public:
 	virtual void loadSettings( KConfig* config );
 	virtual void saveSettings( KConfig* config );
 
-	void setGroup( const QString& groupName );
+	void setGroup( const TQString& groupName );
 
 public:
-	QString     m_configGroupName;
+	TQString     m_configGroupName;
 
-	QStringList m_recentSources;
-	QString     m_lastChosenSourceURL;
-	QStringList m_recentDestinations;
-	QString     m_lastChosenDestinationURL;
-	QString     m_encoding;
+	TQStringList m_recentSources;
+	TQString     m_lastChosenSourceURL;
+	TQStringList m_recentDestinations;
+	TQString     m_lastChosenDestinationURL;
+	TQString     m_encoding;
 };
 
 #endif // FILESSETTINGS_H
diff --git a/kompare/libdialogpages/pagebase.cpp b/kompare/libdialogpages/pagebase.cpp
index de062634..ef9aa1ea 100644
--- a/kompare/libdialogpages/pagebase.cpp
+++ b/kompare/libdialogpages/pagebase.cpp
@@ -17,12 +17,12 @@
 **
 ***************************************************************************/
 
-#include <qlayout.h>
-#include <qobjectlist.h>
+#include <tqlayout.h>
+#include <tqobjectlist.h>
 
 #include "pagebase.h"
 
-PageBase::PageBase( QWidget* parent ) : KTabCtl( parent )
+PageBase::PageBase( TQWidget* parent ) : KTabCtl( parent )
 {
 
 }
@@ -33,7 +33,7 @@ PageBase::~PageBase()
 }
 
 /** No descriptions */
-QSize PageBase::sizeHintForWidget( QWidget* widget )
+TQSize PageBase::sizeHintForWidget( TQWidget* widget )
 {
 	//
 	// The size is computed by adding the sizeHint().height() of all
@@ -44,23 +44,23 @@ QSize PageBase::sizeHintForWidget( QWidget* widget )
 	// this code in this method has been ripped out of a file in kbabel
 	// so copyright goes to the kbabel authors.
 
-	QSize size;
+	TQSize size;
 
 	int numChild = 0;
-	QObjectList *l = (QObjectList*)(widget->children());
+	TQObjectList *l = (TQObjectList*)(widget->children());
 
 	for( uint i=0; i < l->count(); i++ )
 	{
-		QObject *o = l->at(i);
+		TQObject *o = l->at(i);
 		if( o->isWidgetType() )
 		{
 			numChild += 1;
-			QWidget *w=((QWidget*)o);
+			TQWidget *w=((TQWidget*)o);
 
-			QSize s = w->sizeHint();
+			TQSize s = w->sizeHint();
 			if( s.isEmpty() == true )
 			{
-				s = QSize( 50, 100 ); // Default size
+				s = TQSize( 50, 100 ); // Default size
 			}
 			size.setHeight( size.height() + s.height() );
 			if( s.width() > size.width() )
@@ -73,11 +73,11 @@ QSize PageBase::sizeHintForWidget( QWidget* widget )
 	if( numChild > 0 )
 	{
 		size.setHeight( size.height() + widget->layout()->spacing()*(numChild-1) );
-		size += QSize( widget->layout()->margin()*2, widget->layout()->margin()*2 + 1 );
+		size += TQSize( widget->layout()->margin()*2, widget->layout()->margin()*2 + 1 );
 	}
 	else
 	{
-		size = QSize( 1, 1 );
+		size = TQSize( 1, 1 );
 	}
 
 	return( size );
diff --git a/kompare/libdialogpages/pagebase.h b/kompare/libdialogpages/pagebase.h
index 7aab7b81..0f188b36 100644
--- a/kompare/libdialogpages/pagebase.h
+++ b/kompare/libdialogpages/pagebase.h
@@ -20,8 +20,8 @@
 #ifndef PAGEBASE_H
 #define PAGEBASE_H
 
-#include <qsize.h>
-#include <qwidget.h>
+#include <tqsize.h>
+#include <tqwidget.h>
 
 #include <kconfig.h>
 #include <ktabctl.h>
@@ -32,12 +32,12 @@ class PageBase : public KTabCtl
 {
 Q_OBJECT
 public: 
-	PageBase( QWidget* );
+	PageBase( TQWidget* );
 	~PageBase();
 
 public:
 	/** No descriptions */
-	QSize        sizeHintForWidget( QWidget* widget );
+	TQSize        sizeHintForWidget( TQWidget* widget );
 	/** No descriptions */
 	virtual void restore();
 	/** No descriptions */
diff --git a/kompare/libdialogpages/settingsbase.cpp b/kompare/libdialogpages/settingsbase.cpp
index dc7b64d6..6e347719 100644
--- a/kompare/libdialogpages/settingsbase.cpp
+++ b/kompare/libdialogpages/settingsbase.cpp
@@ -17,11 +17,11 @@
 **
 ***************************************************************************/
 
-#include <qwidget.h>
+#include <tqwidget.h>
 
 #include "settingsbase.h"
 
-SettingsBase::SettingsBase( QWidget* parent ) : QObject( parent )
+SettingsBase::SettingsBase( TQWidget* parent ) : TQObject( parent )
 {
 
 }
diff --git a/kompare/libdialogpages/settingsbase.h b/kompare/libdialogpages/settingsbase.h
index 5ec035ba..2e6b2f97 100644
--- a/kompare/libdialogpages/settingsbase.h
+++ b/kompare/libdialogpages/settingsbase.h
@@ -20,7 +20,7 @@
 #ifndef SETTINGSBASE_H
 #define SETTINGSBASE_H
 
-#include <qobject.h>
+#include <tqobject.h>
 
 #include "kompare.h"
 
@@ -31,7 +31,7 @@ class SettingsBase : public QObject
 {
 Q_OBJECT
 public:
-	SettingsBase( QWidget* parent );
+	SettingsBase( TQWidget* parent );
 	~SettingsBase();
 
 public:
diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp
index c4e61e8d..1deb9e21 100644
--- a/kompare/libdialogpages/viewpage.cpp
+++ b/kompare/libdialogpages/viewpage.cpp
@@ -17,12 +17,12 @@
 **
 ***************************************************************************/
 
-#include <qcheckbox.h>
-#include <qgroupbox.h>
-#include <qhgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qspinbox.h>
+#include <tqcheckbox.h>
+#include <tqgroupbox.h>
+#include <tqhgroupbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqspinbox.h>
 
 #include <kapplication.h>
 #include <kcolorbutton.h>
@@ -33,62 +33,62 @@
 #include "viewpage.h"
 #include "viewsettings.h"
 
-ViewPage::ViewPage( QWidget* parent ) : PageBase( parent )
+ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
 {
-	QWidget*     page;
-	QVBoxLayout* layout;
-	QGroupBox*   colorGroupBox;
-	QHGroupBox*  snolGroupBox;
-	QHGroupBox*  tabGroupBox;
-	QLabel*      label;
-
-	page   = new QWidget( this );
-	layout = new QVBoxLayout( page );
+	TQWidget*     page;
+	TQVBoxLayout* layout;
+	TQGroupBox*   colorGroupBox;
+	TQHGroupBox*  snolGroupBox;
+	TQHGroupBox*  tabGroupBox;
+	TQLabel*      label;
+
+	page   = new TQWidget( this );
+	layout = new TQVBoxLayout( page );
 	layout->setSpacing( KDialog::spacingHint() );
 	layout->setMargin( KDialog::marginHint() );
 
 	// add a groupbox
-	colorGroupBox = new QGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page );
+	colorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page );
 	layout->addWidget( colorGroupBox );
 	colorGroupBox->setMargin( KDialog::marginHint() );
 
 	// add the removeColor
-	label = new QLabel( i18n( "Removed color:" ), colorGroupBox );
+	label = new TQLabel( i18n( "Removed color:" ), colorGroupBox );
 	m_removedColorButton = new KColorButton( colorGroupBox );
 	label->setBuddy( m_removedColorButton );
 
 	// add the changeColor
-	label = new QLabel( i18n( "Changed color:" ), colorGroupBox );
+	label = new TQLabel( i18n( "Changed color:" ), colorGroupBox );
 	m_changedColorButton = new KColorButton( colorGroupBox );
 	label->setBuddy( m_changedColorButton );
 
 	// add the addColor
-	label = new QLabel( i18n( "Added color:" ), colorGroupBox );
+	label = new TQLabel( i18n( "Added color:" ), colorGroupBox );
 	m_addedColorButton = new KColorButton( colorGroupBox );
 	label->setBuddy( m_addedColorButton );
 
 	// add the appliedColor
-	label = new QLabel( i18n( "Applied color:" ), colorGroupBox );
+	label = new TQLabel( i18n( "Applied color:" ), colorGroupBox );
 	m_appliedColorButton = new KColorButton( colorGroupBox );
 	label->setBuddy( m_appliedColorButton );
 
 	// scroll number of lines (snol)
-	snolGroupBox = new QHGroupBox( i18n( "Mouse Wheel" ), page );
+	snolGroupBox = new TQHGroupBox( i18n( "Mouse Wheel" ), page );
 	layout->addWidget( snolGroupBox );
 	snolGroupBox->setMargin( KDialog::marginHint() );
 
-	label            = new QLabel( i18n( "Number of lines:" ), snolGroupBox );
-	m_snolSpinBox    = new QSpinBox( 0, 50, 1, snolGroupBox );
+	label            = new TQLabel( i18n( "Number of lines:" ), snolGroupBox );
+	m_snolSpinBox    = new TQSpinBox( 0, 50, 1, snolGroupBox );
 	label->setBuddy( m_snolSpinBox );
 
 	// Temporarily here for testing...
 	// number of spaces for a tab character stuff
-	tabGroupBox = new QHGroupBox( i18n( "Tabs to Spaces" ), page );
+	tabGroupBox = new TQHGroupBox( i18n( "Tabs to Spaces" ), page );
 	layout->addWidget( tabGroupBox );
 	tabGroupBox->setMargin( KDialog::marginHint() );
 
-	label = new QLabel( i18n( "Number of spaces to convert a tab character to:" ), tabGroupBox );
-	m_tabSpinBox = new QSpinBox( 1, 16, 1, tabGroupBox );
+	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 );
@@ -96,21 +96,21 @@ ViewPage::ViewPage( QWidget* parent ) : PageBase( parent )
 
 	addTab( page, i18n( "A&ppearance" ) );
 
-	page   = new QWidget( this );
-	layout = new QVBoxLayout( page );
+	page   = new TQWidget( this );
+	layout = new TQVBoxLayout( page );
 	layout->setSpacing( KDialog::spacingHint() );
 	layout->setMargin( KDialog::marginHint() );
 
-	QHGroupBox* gb = new QHGroupBox( i18n( "Text Font" ), page );
+	TQHGroupBox* gb = new TQHGroupBox( i18n( "Text Font" ), page );
 	layout->addWidget( gb );
 	gb->setMargin( KDialog::marginHint() );
 
-	label = new QLabel( i18n( "Font:" ), gb );
+	label = new TQLabel( i18n( "Font:" ), gb );
 	m_fontCombo = new KFontCombo( gb, "fontcombo" );
 	label->setBuddy( m_fontCombo );
 
-	label = new QLabel( i18n( "Size:" ), gb );
-	m_fontSizeSpinBox = new QSpinBox( 6, 24, 1, gb, "fontsize" );
+	label = new TQLabel( i18n( "Size:" ), gb );
+	m_fontSizeSpinBox = new TQSpinBox( 6, 24, 1, gb, "fontsize" );
 	label->setBuddy( m_fontSizeSpinBox );
 
 	layout->addStretch( 1 );
@@ -157,7 +157,7 @@ void ViewPage::apply()
 	m_settings->m_scrollNoOfLines     = m_snolSpinBox->value();
 	m_settings->m_tabToNumberOfSpaces = m_tabSpinBox->value();
 
-	m_settings->m_font                = QFont( m_fontCombo->currentFont() );
+	m_settings->m_font                = TQFont( m_fontCombo->currentFont() );
 	m_settings->m_font.setPointSize( m_fontSizeSpinBox->value() );
 
 	m_settings->saveSettings( kapp->config() );
diff --git a/kompare/libdialogpages/viewpage.h b/kompare/libdialogpages/viewpage.h
index 30591f4b..6b75684e 100644
--- a/kompare/libdialogpages/viewpage.h
+++ b/kompare/libdialogpages/viewpage.h
@@ -34,7 +34,7 @@ class ViewPage : public PageBase
 {
 Q_OBJECT
 public:
-	ViewPage( QWidget* );
+	ViewPage( TQWidget* );
 	~ViewPage();
 
 public:
@@ -55,10 +55,10 @@ public:
 	KColorButton* m_addedColorButton;
 	KColorButton* m_appliedColorButton;
 	// snol == scroll number of lines
-	QSpinBox*     m_snolSpinBox;
-	QSpinBox*     m_tabSpinBox;
+	TQSpinBox*     m_snolSpinBox;
+	TQSpinBox*     m_tabSpinBox;
 	KFontCombo*   m_fontCombo;
-	QSpinBox*     m_fontSizeSpinBox;
+	TQSpinBox*     m_fontSizeSpinBox;
 };
 
 #endif
diff --git a/kompare/libdialogpages/viewsettings.cpp b/kompare/libdialogpages/viewsettings.cpp
index c55dd40e..403746b1 100644
--- a/kompare/libdialogpages/viewsettings.cpp
+++ b/kompare/libdialogpages/viewsettings.cpp
@@ -17,7 +17,7 @@
 **
 ***************************************************************************/
 
-#include <qfont.h>
+#include <tqfont.h>
 
 #include <kconfig.h>
 #include <kglobalsettings.h>
@@ -26,12 +26,12 @@
 
 using namespace Diff2;
 
-const QColor ViewSettings::default_removeColor (190, 237, 190);
-const QColor ViewSettings::default_changeColor (237, 190, 190);
-const QColor ViewSettings::default_addColor    (190, 190, 237);
-const QColor ViewSettings::default_appliedColor(237, 237, 190);
+const TQColor ViewSettings::default_removeColor (190, 237, 190);
+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( QWidget* parent )
+ViewSettings::ViewSettings( TQWidget* parent )
 	: SettingsBase( parent ),
 	m_removeColor( 0, 0, 0 ),
 	m_changeColor( 0, 0, 0),
@@ -56,7 +56,7 @@ void ViewSettings::loadSettings( KConfig* config )
 	m_scrollNoOfLines     = cfg.readNumEntry  ( "ScrollNoOfLines",     3 );
 	m_tabToNumberOfSpaces = cfg.readNumEntry  ( "TabToNumberOfSpaces", 4 );
 
-	QFont stdFixed = KGlobalSettings::fixedFont();
+	TQFont stdFixed = KGlobalSettings::fixedFont();
 	stdFixed.setPointSize( 10 );
 	m_font                = cfg.readFontEntry ( "TextFont", &stdFixed );
 }
@@ -74,10 +74,10 @@ void ViewSettings::saveSettings( KConfig* config )
 	cfg.writeEntry( "TextFont",            m_font );
 }
 
-QColor ViewSettings::colorForDifferenceType( int type, bool selected, bool applied )
+TQColor ViewSettings::colorForDifferenceType( int type, bool selected, bool applied )
 {
 	// FIXME: does not belong here
-	QColor color;
+	TQColor color;
 	if( applied )
 		color = m_appliedColor;
 	else
diff --git a/kompare/libdialogpages/viewsettings.h b/kompare/libdialogpages/viewsettings.h
index ab0f4d5f..24bf8e9a 100644
--- a/kompare/libdialogpages/viewsettings.h
+++ b/kompare/libdialogpages/viewsettings.h
@@ -20,8 +20,8 @@
 #ifndef VIEWSETTINGS_H
 #define VIEWSETTINGS_H
 
-#include <qcolor.h>
-#include <qwidget.h>
+#include <tqcolor.h>
+#include <tqwidget.h>
 
 #include "difference.h"
 #include "settingsbase.h"
@@ -30,32 +30,32 @@ class ViewSettings : public SettingsBase
 {
 Q_OBJECT
 public:
-	static const QColor default_removeColor;
-	static const QColor default_changeColor;
-	static const QColor default_addColor;
-	static const QColor default_appliedColor;
+	static const TQColor default_removeColor;
+	static const TQColor default_changeColor;
+	static const TQColor default_addColor;
+	static const TQColor default_appliedColor;
 
-	ViewSettings( QWidget* parent );
+	ViewSettings( TQWidget* parent );
 	~ViewSettings();
 public:
 	// some virtual functions that will be overloaded from the base class
 	virtual void loadSettings( KConfig* config );
 	virtual void saveSettings( KConfig* config );
-	QColor colorForDifferenceType( int type, bool selected = false, bool applied = false );
+	TQColor colorForDifferenceType( int type, bool selected = false, bool applied = false );
 
 public:
-	QColor m_removeColor;
-	QColor m_changeColor;
-	QColor m_addColor;
-	QColor m_appliedColor;
-	QColor m_selectedRemoveColor;
-	QColor m_selectedChangeColor;
-	QColor m_selectedAddColor;
-	QColor m_selectedAppliedColor;
+	TQColor m_removeColor;
+	TQColor m_changeColor;
+	TQColor m_addColor;
+	TQColor m_appliedColor;
+	TQColor m_selectedRemoveColor;
+	TQColor m_selectedChangeColor;
+	TQColor m_selectedAddColor;
+	TQColor m_selectedAppliedColor;
 	int    m_scrollNoOfLines;
 	int    m_tabToNumberOfSpaces;
 
-	QFont  m_font;
+	TQFont  m_font;
 };
 
 #endif // VIEWSETTINGS_H