Rename a number of old tq methods that are no longer tq specific

63 files changed, 342 insertions, 342 deletions

diff --git a/kchart/csvimportdialog.cc b/kchart/csvimportdialog.cc
index 38cfd8c2..b0e52fea 100644
--- a/kchart/csvimportdialog.cc
+++ b/kchart/csvimportdialog.cc
@@ -27,11 +27,11 @@
 #include <tqlineedit.h>
 #include <tqcombobox.h>
 #include <tqspinbox.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqbuttongroup.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -60,14 +60,14 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray)
     kapp->restoreOverrideCursor();
 
     TQStringList encodings;
-    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
-    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() );
+    encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
+    encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
     encodings += KGlobal::charsets()->descriptiveEncodingNames();
     // Add a few non-standard encodings, which might be useful for text files
     const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
-    encodings << description.tqarg("Apple Roman"); // Apple
-    encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS
-    encodings << description.tqarg("CP 1258"); // Windows
+    encodings << description.arg("Apple Roman"); // Apple
+    encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS
+    encodings << description.arg("CP 1258"); // Windows
     m_dialog->comboBoxEncoding->insertStringList(encodings);
 
     m_formatList << i18n( "Text" );
@@ -82,7 +82,7 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray)
 
     fillTable();
 
-    //resize(tqsizeHint());
+    //resize(sizeHint());
     resize( 600, 400 ); // Try to show as much as possible of the table view
     setMainWidget(m_dialog);
 
@@ -611,7 +611,7 @@ TQTextCodec* CSVImportDialog::getCodec(void) const
         // Default: UTF-8
         kdWarning(30502) << "Cannot find encoding:" << strCodec << endl;
         // ### TODO: what parent to use?
-        KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) );
+        KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) );
         return 0;
     }
 
diff --git a/kchart/csvimportdialogui.ui b/kchart/csvimportdialogui.ui
index a061c0cc..4e53b54d 100644
--- a/kchart/csvimportdialogui.ui
+++ b/kchart/csvimportdialogui.ui
@@ -68,7 +68,7 @@
             </attribute>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout5</cstring>
+                    <cstring>layout5</cstring>
                 </property>
                 <property name="geometry">
                     <rect>
@@ -84,7 +84,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout3</cstring>
+                            <cstring>layout3</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -122,7 +122,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>106</width>
                                         <height>20</height>
@@ -173,7 +173,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -274,7 +274,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>30</width>
                                     <height>32767</height>
@@ -364,7 +364,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>51</width>
                             <height>21</height>
@@ -381,7 +381,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>51</width>
                             <height>21</height>
@@ -430,7 +430,7 @@
                             <property name="textFormat">
                                 <enum>AutoText</enum>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
@@ -479,7 +479,7 @@
                             <property name="textFormat">
                                 <enum>AutoText</enum>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
@@ -523,7 +523,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>468</width>
                                     <height>20</height>
@@ -540,7 +540,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>468</width>
                                     <height>20</height>
@@ -557,7 +557,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>611</width>
                                     <height>20</height>
@@ -574,7 +574,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>71</width>
                                     <height>20</height>
diff --git a/kchart/kchartBackgroundPixmapConfigPage.cc b/kchart/kchartBackgroundPixmapConfigPage.cc
index c0d3d70e..54127a9a 100644
--- a/kchart/kchartBackgroundPixmapConfigPage.cc
+++ b/kchart/kchartBackgroundPixmapConfigPage.cc
@@ -33,7 +33,7 @@
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
 #include <tqspinbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
diff --git a/kchart/kchartColorConfigPage.cc b/kchart/kchartColorConfigPage.cc
index d5666802..9e4123b3 100644
--- a/kchart/kchartColorConfigPage.cc
+++ b/kchart/kchartColorConfigPage.cc
@@ -24,7 +24,7 @@
 #include <kdialog.h>
 #include <klocale.h>
 #include <kcolorbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 #include <tqwhatsthis.h>
@@ -51,11 +51,11 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params,
 
     TQVBoxLayout* toplevel = new TQVBoxLayout( this, 14 );
     TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Colors"), this );
-    gb->tqlayout()->setSpacing(KDialog::spacingHint());
-    gb->tqlayout()->setMargin(KDialog::marginHint());
+    gb->layout()->setSpacing(KDialog::spacingHint());
+    gb->layout()->setMargin(KDialog::marginHint());
     toplevel->addWidget( gb);
     TQString wtstr;
-    TQGridLayout* grid = new TQGridLayout( gb->tqlayout(), 8, 3 );
+    TQGridLayout* grid = new TQGridLayout( gb->layout(), 8, 3 );
 
     const int labelAlign = AlignRight | AlignVCenter;
     int row = -1;
@@ -63,7 +63,7 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params,
 {                                          \
     ++row;                                 \
     TQLabel* l = new TQLabel( title, gb );   \
-    l->tqsetAlignment( labelAlign );         \
+    l->setAlignment( labelAlign );         \
     grid->addWidget( l, row, 0 );          \
     btn = new KColorButton( gb );          \
     l->setBuddy( btn );                    \
@@ -140,7 +140,7 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params,
 
 
     /*TQLabel* edgeLA = new TQLabel( i18n( "Edge color (pies only)" ), this );
-      edgeLA->tqsetAlignment( AlignRight | AlignVCenter );
+      edgeLA->setAlignment( AlignRight | AlignVCenter );
       grid->addWidget( edgeLA, 6, 0 );
       _edgeCB = new KColorButton( this );
       grid->addWidget( _edgeCB, 6, 1 );*/
@@ -149,11 +149,11 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params,
 // 	TQString labeltext;
 // 	labeltext.sprintf( i18n( "Data color #%d:"), i );
 // 	TQLabel* dataLA = new TQLabel( labeltext, this );
-// 	dataLA->tqsetAlignment(AlignRight | AlignVCenter);
-// 	dataLA->resize( dataLA->tqsizeHint() );
+// 	dataLA->setAlignment(AlignRight | AlignVCenter);
+// 	dataLA->resize( dataLA->sizeHint() );
 // 	grid->addWidget( dataLA, i, 2 );
 // 	_dataCB[i] = new KColorButton( this );
-// 	_dataCB[i]->resize( _dataCB[i]->tqsizeHint() );
+// 	_dataCB[i]->resize( _dataCB[i]->sizeHint() );
 // 	grid->addWidget( _dataCB[i], i, 3 );
 // 	grid->addRowSpacing(i,_textCB->height());
 // 	grid->setRowStretch(i,0);
@@ -191,7 +191,7 @@ void KChartColorConfigPage::initDataColorList()
         extColor.resize( m_params->maxDataColor() );
         if(i<m_params->maxDataColor())
         {
-            _dataColorLB->insertItem(m_params->legendText( i ).isEmpty() ? i18n("Series %1").tqarg(i+1) :m_params->legendText( i ) );
+            _dataColorLB->insertItem(m_params->legendText( i ).isEmpty() ? i18n("Series %1").arg(i+1) :m_params->legendText( i ) );
             extColor[i] =m_params->dataColor(i);
         }
     }
diff --git a/kchart/kchartComboConfigPage.cc b/kchart/kchartComboConfigPage.cc
index 72453584..1e1dd871 100644
--- a/kchart/kchartComboConfigPage.cc
+++ b/kchart/kchartComboConfigPage.cc
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
@@ -40,11 +40,11 @@ KChartComboPage::KChartComboPage( KChartParams* params,
 {
     //TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10 );
 
-    TQGridLayout* tqlayout = new TQGridLayout(this, 2, 2,KDialog::marginHint(), KDialog::spacingHint() );
-    //toplevel->addLayout( tqlayout );
+    TQGridLayout* layout = new TQGridLayout(this, 2, 2,KDialog::marginHint(), KDialog::spacingHint() );
+    //toplevel->addLayout( layout );
     TQButtonGroup* gb = new TQButtonGroup( i18n("HLC Style"), this );
     TQGridLayout *grid1 = new TQGridLayout(gb,7,1,KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->addWidget(gb,0,0);
+    layout->addWidget(gb,0,0);
 
     diamond=new TQRadioButton( i18n("Diamond"), gb ); ;
     grid1->addWidget(diamond,0,0);
@@ -54,7 +54,7 @@ KChartComboPage::KChartComboPage( KChartParams* params,
     grid1->addWidget(connecting,2,0);
     icap=new TQRadioButton( i18n("Icap"), gb );
     grid1->addWidget(icap,3,0);
-    gb->tqsetAlignment(TQt::AlignLeft);
+    gb->setAlignment(TQt::AlignLeft);
     grid1->addColSpacing(0,diamond->width());
     grid1->addColSpacing(0,closeconnected->width());
     grid1->addColSpacing(0,connecting->width());
@@ -63,7 +63,7 @@ KChartComboPage::KChartComboPage( KChartParams* params,
     grid1->activate();
     //it's not good but I don't know how
     //to reduce space
-    tqlayout->addColSpacing(1,300);
+    layout->addColSpacing(1,300);
 }
 
 void KChartComboPage::init()
diff --git a/kchart/kchartDataConfigPage.cc b/kchart/kchartDataConfigPage.cc
index 3766903c..84b6e872 100644
--- a/kchart/kchartDataConfigPage.cc
+++ b/kchart/kchartDataConfigPage.cc
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 
 #include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
@@ -82,10 +82,10 @@ KChartDataConfigPage::KChartDataConfigPage( KChartParams* params,
     TQButtonGroup *gb = new TQVButtonGroup( i18n( "Data Format" ), this );
 
     m_rowMajor = new TQRadioButton( i18n( "Data in rows" ), gb );
-    m_rowMajor->resize( m_rowMajor->tqsizeHint() );
+    m_rowMajor->resize( m_rowMajor->sizeHint() );
 
     m_colMajor = new TQRadioButton( i18n( "Data in columns" ), gb );
-    m_colMajor->resize( m_colMajor->tqsizeHint() );
+    m_colMajor->resize( m_colMajor->sizeHint() );
 
     grid1->addWidget(gb, 2, 0);
 
@@ -93,7 +93,7 @@ KChartDataConfigPage::KChartDataConfigPage( KChartParams* params,
     TQWhatsThis::add(m_rowMajor, i18n("By default one row is considered to be a data set and each column holds the individual values of the data series. This sets the data in rows on your chart."));
 
     TQWhatsThis::add(m_colMajor, i18n("Here you can choose to have each column hold one data set. Note that the values are not really swapped but only their interpretation."));
-    m_colMajor->resize( m_colMajor->tqsizeHint() );
+    m_colMajor->resize( m_colMajor->sizeHint() );
     grid1->addWidget(gb, 1, 0);
     grid1->setColStretch(3, 0);
 
diff --git a/kchart/kchartDataEditor.cc b/kchart/kchartDataEditor.cc
index db1ce1f3..b89f5256 100644
--- a/kchart/kchartDataEditor.cc
+++ b/kchart/kchartDataEditor.cc
@@ -1,7 +1,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqregexp.h>
 #include <tqwhatsthis.h>
@@ -183,16 +183,16 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) :
   
     // Create the Rows setting
     m_rowsLA = new TQLabel( i18n("# Rows:" ), page );
-    m_rowsLA->resize( m_rowsLA->tqsizeHint() );
+    m_rowsLA->resize( m_rowsLA->sizeHint() );
     m_rowsSB = new kchartDataSpinBox( page );
-    m_rowsSB->resize( m_rowsSB->tqsizeHint() );
+    m_rowsSB->resize( m_rowsSB->sizeHint() );
     m_rowsSB->setMinValue(1);
 
     // Create the columns setting
     m_colsLA = new TQLabel( i18n("# Columns:" ), page );
-    m_colsLA->resize( m_colsLA->tqsizeHint() );
+    m_colsLA->resize( m_colsLA->sizeHint() );
     m_colsSB = new kchartDataSpinBox( page );
-    m_colsSB->resize( m_colsSB->tqsizeHint() );
+    m_colsSB->resize( m_colsSB->sizeHint() );
     m_colsSB->setMinValue(1);
     
 #if 0
@@ -240,7 +240,7 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) :
     connect( m_removeColButton, TQT_SIGNAL( clicked() ),
 	     this,              TQT_SLOT( removeCurrentColumn() ) );
 
-    // Start the tqlayout.  The buttons are at the top.
+    // Start the layout.  The buttons are at the top.
     TQVBoxLayout  *topLayout = new TQVBoxLayout( page );
     
     TQHBoxLayout* insertRemoveLayout = new TQHBoxLayout( );
@@ -429,7 +429,7 @@ void kchartDataEditor::setData( KChartParams *params, KDChartTableData *dat )
             if (t.isValid()) {
                 if ( t.type() == TQVariant::Double ) {
 		    m_table->setText(row, col, 
-				     TQString("%1").tqarg(t.toDouble()));
+				     TQString("%1").arg(t.toDouble()));
 		}
                 else if ( t.type() == TQVariant::String )
                     kdDebug(35001) << "I cannot handle strings in the table yet"
diff --git a/kchart/kchartFontConfigPage.cc b/kchart/kchartFontConfigPage.cc
index eef71cb6..bbda1f68 100644
--- a/kchart/kchartFontConfigPage.cc
+++ b/kchart/kchartFontConfigPage.cc
@@ -27,7 +27,7 @@
 #include <kcolorbutton.h>
 #include <kdebug.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
@@ -55,7 +55,7 @@ public:
 
     void setFont( const TQFont& font )  {
         _font = font;
-        listBox()->tqrepaint();
+        listBox()->repaint();
     }
     TQFont font() const {
         return _font;
@@ -90,14 +90,14 @@ KChartFontConfigPage::KChartFontConfigPage( KChartParams* params,
 
     // The listbox
     m_list = new TQListBox(this);
-    m_list->resize( m_list->tqsizeHint() );
+    m_list->resize( m_list->sizeHint() );
     grid->addWidget(m_list, 0, 0); // Row 0-0, col 0-1
 
     // The font button.
     m_fontButton = new TQPushButton( this);
     m_fontButton->setText(i18n("Font..."));
     TQWhatsThis::add(m_fontButton, i18n("Select an item in the list above and click on this button to display the KDE font dialog in order to choose a new font for this item."));
-    m_fontButton->resize( m_fontButton->tqsizeHint() );
+    m_fontButton->resize( m_fontButton->sizeHint() );
     grid->addWidget( m_fontButton, 1, 0);
 
 #if 0
diff --git a/kchart/kchartHeaderFooterConfigPage.cc b/kchart/kchartHeaderFooterConfigPage.cc
index c097c381..89ef02f4 100644
--- a/kchart/kchartHeaderFooterConfigPage.cc
+++ b/kchart/kchartHeaderFooterConfigPage.cc
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <kdialog.h>
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqbuttongroup.h>
@@ -39,64 +39,64 @@ KChartHeaderFooterConfigPage::KChartHeaderFooterConfigPage( KChartParams* params
                                                       TQWidget* parent ) :
     TQWidget( parent ),_params( params )
 {
-    TQGridLayout* tqlayout = new TQGridLayout( this, 4, 3 );
-    tqlayout->setSpacing( KDialog::spacingHint() );
-    tqlayout->setMargin( KDialog::marginHint() );
+    TQGridLayout* layout = new TQGridLayout( this, 4, 3 );
+    layout->setSpacing( KDialog::spacingHint() );
+    layout->setMargin( KDialog::marginHint() );
 
     TQLabel *lab=new TQLabel(i18n("Title:"), this);
     TQWhatsThis::add(lab, i18n("Write here the title of your chart if you want one. The title will be centered on top above your chart."));
-    tqlayout->addWidget(lab,0,0);
+    layout->addWidget(lab,0,0);
 
     titleEdit=new TQLineEdit(this);
     TQWhatsThis::add(titleEdit, i18n("Write here the title of your chart if you want one. The title will be centered on top above your chart."));
-    tqlayout->addWidget(titleEdit,0,1);
+    layout->addWidget(titleEdit,0,1);
 
     titleColorButton=new KColorButton(this);
     TQWhatsThis::add(titleColorButton, i18n("Click on this button to choose the color for the title font."));
-    tqlayout->addWidget(titleColorButton,0,2);
+    layout->addWidget(titleColorButton,0,2);
 
     titleFontButton=new TQPushButton(i18n("Font..."),this);
     TQWhatsThis::add(titleFontButton, i18n("Click on this button to choose the font family, style and size for the title."));
-    tqlayout->addWidget(titleFontButton,0,3);
+    layout->addWidget(titleFontButton,0,3);
     connect( titleFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeTitleFont()));
 
     lab=new TQLabel(i18n("Subtitle:"),this);
     TQWhatsThis::add(lab, i18n("Write here the subtitle of your chart if you want one. The subtitle will be centered on top just below the title."));
-    tqlayout->addWidget(lab,1,0);
+    layout->addWidget(lab,1,0);
 
     subtitleEdit=new TQLineEdit(this);
     TQWhatsThis::add(subtitleEdit, i18n("Write here the subtitle of your chart if you want one. The subtitle will be centered on top just below the title."));
-    tqlayout->addWidget(subtitleEdit,1,1);
+    layout->addWidget(subtitleEdit,1,1);
 
     subtitleColorButton=new KColorButton(this);
     TQWhatsThis::add(subtitleColorButton, i18n("Click on this button to choose the color for the subtitle font."));
-    tqlayout->addWidget(subtitleColorButton,1,2);
+    layout->addWidget(subtitleColorButton,1,2);
 
     subtitleFontButton=new TQPushButton(i18n("Font..."),this);
     TQWhatsThis::add(subtitleFontButton, i18n("Click on this button to choose the font family, style and size for the subtitle."));
-    tqlayout->addWidget(subtitleFontButton,1,3);
+    layout->addWidget(subtitleFontButton,1,3);
     connect( subtitleFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeSubtitleFont()));
 
     lab=new TQLabel(i18n("Footer:"),this);
     TQWhatsThis::add(lab, i18n("Write here the footer of your chart if you want one. The footer will be centered at the bottom just below your chart."));
-    tqlayout->addWidget(lab,2,0);
+    layout->addWidget(lab,2,0);
 
     footerEdit=new TQLineEdit(this);
     TQWhatsThis::add(footerEdit, i18n("Write here the subtitle of your chart if you want one. The subtitle will be centered on top just below the title."));
-    tqlayout->addWidget(footerEdit,2,1);
+    layout->addWidget(footerEdit,2,1);
 
     footerColorButton=new KColorButton(this);
     TQWhatsThis::add(footerColorButton, i18n("Click on this button to choose the color for the footer font."));
-    tqlayout->addWidget(footerColorButton,2,2);
+    layout->addWidget(footerColorButton,2,2);
 
     footerFontButton=new TQPushButton(i18n("Font..."),this);
     TQWhatsThis::add(footerFontButton, i18n("Click on this button to choose the font family, style and size for the footer."));
     connect( footerFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeFooterFont()));
-    tqlayout->addWidget(footerFontButton,2,3);
+    layout->addWidget(footerFontButton,2,3);
 
-    tqlayout->addItem( new TQSpacerItem( 5, 5, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 3, 0 );
+    layout->addItem( new TQSpacerItem( 5, 5, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 3, 0 );
 
-    tqlayout->activate();
+    layout->activate();
 }
 
 void KChartHeaderFooterConfigPage::init()
diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc
index 39d99963..2c027138 100644
--- a/kchart/kchartLegendConfigPage.cc
+++ b/kchart/kchartLegendConfigPage.cc
@@ -49,15 +49,15 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
     TQWidget( parent ),_params( params )
 {
   //Layout for 4 blocks
-  TQGridLayout* tqlayout = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout* layout = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
   //1. Block: General settings
   TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, i18n("General"), this );
-  gb->tqlayout()->setSpacing(KDialog::spacingHint());
-  gb->tqlayout()->setMargin(KDialog::marginHint());
-  tqlayout->addWidget( gb, 0, 0 );
+  gb->layout()->setSpacing(KDialog::spacingHint());
+  gb->layout()->setMargin(KDialog::marginHint());
+  layout->addWidget( gb, 0, 0 );
 
-  TQGridLayout *grid2 = new TQGridLayout( gb->tqlayout(), 4, 2 );
+  TQGridLayout *grid2 = new TQGridLayout( gb->layout(), 4, 2 );
 
   TQLabel* lab = new TQLabel( i18n("Title:"), gb );
   TQWhatsThis::add(lab, i18n("Write here the title of the legend, which is displayed at the top of the legend box."));
@@ -70,11 +70,11 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
   gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Legend Position"), this );
   TQWhatsThis::add(gb, i18n("<qt>Choose the location of the legend on the chart by "
       "clicking a location button.\nUse the central button to <b>hide</b> the legend.</qt>"));
-  gb->tqlayout()->setSpacing(KDialog::spacingHint());
-  gb->tqlayout()->setMargin(KDialog::marginHint());
+  gb->layout()->setSpacing(KDialog::spacingHint());
+  gb->layout()->setMargin(KDialog::marginHint());
   gb->setExclusive( true );
 
-  TQGridLayout *grid1 = new TQGridLayout( gb->tqlayout(), 5, 5 );
+  TQGridLayout *grid1 = new TQGridLayout( gb->layout(), 5, 5 );
 
   lTopLeft          = addButton( grid1, gb, i18n("Top-Left"),      "chart_legend_topleft",     0, 0 );
   lTopLeftTop       = addButton( grid1, gb, i18n("Top-Left-Top"),  "chart_legend_toplefttop",  0, 1 );
@@ -98,17 +98,17 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
   lBottomRightBottom= addButton( grid1, gb, i18n("Bottom-Right-Bottom"), "chart_legend_bottomrightbottom",4, 3 );
   lBottomRight      = addButton( grid1, gb, i18n("Bottom-Right"),        "chart_legend_bottomright",      4, 4 );
 
-  gb->tqsetAlignment( TQt::AlignLeft );
-  tqlayout->addMultiCellWidget( gb, 1,2, 0,0 );
+  gb->setAlignment( TQt::AlignLeft );
+  layout->addMultiCellWidget( gb, 1,2, 0,0 );
 
   // 3. Block: Font
   gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Font"), this );
   TQWhatsThis::add(gb, i18n("This Font box can be used to set different fonts for the legend title and the individual entries."));
-  gb->tqlayout()->setSpacing(KDialog::spacingHint());
-  gb->tqlayout()->setMargin(KDialog::marginHint());
-  tqlayout->addWidget( gb, 0, 1 );
+  gb->layout()->setSpacing(KDialog::spacingHint());
+  gb->layout()->setMargin(KDialog::marginHint());
+  layout->addWidget( gb, 0, 1 );
 
-  TQGridLayout *grid4 = new TQGridLayout( gb->tqlayout(), 4, 2 );
+  TQGridLayout *grid4 = new TQGridLayout( gb->layout(), 4, 2 );
   titleLegendFontButton = new TQPushButton( gb );
 
   lab = new TQLabel( i18n("Legend title font:"), gb );
@@ -134,9 +134,9 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
   orientationGroup = new TQVButtonGroup( i18n("Orientation"), this );
   TQWhatsThis::add(orientationGroup, i18n("Select, if the legend's items should be drawn next to each other, or below each other."));
   orientationGroup->setRadioButtonExclusive(true);
-  orientationGroup->tqlayout()->setSpacing(KDialog::spacingHint());
-  orientationGroup->tqlayout()->setMargin(KDialog::marginHint());
-  tqlayout->addWidget( orientationGroup, 1, 1 );
+  orientationGroup->layout()->setSpacing(KDialog::spacingHint());
+  orientationGroup->layout()->setMargin(KDialog::marginHint());
+  layout->addWidget( orientationGroup, 1, 1 );
 
   TQRadioButton* orientation = new TQRadioButton( i18n("Vertically"), orientationGroup );
   orientation = new TQRadioButton( i18n("Horizontally"), orientationGroup );
@@ -145,11 +145,11 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
   // 5. Block: Text Colors
   gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Color"), this );
   TQWhatsThis::add(gb, i18n("This Color box can be used to set different colors for the legend title and text."));
-  gb->tqlayout()->setSpacing(KDialog::spacingHint());
-  gb->tqlayout()->setMargin(KDialog::marginHint());
-  tqlayout->addWidget( gb, 2, 1 );
+  gb->layout()->setSpacing(KDialog::spacingHint());
+  gb->layout()->setMargin(KDialog::marginHint());
+  layout->addWidget( gb, 2, 1 );
 
-  TQGridLayout *grid3 = new TQGridLayout( gb->tqlayout(), 6, 2 );
+  TQGridLayout *grid3 = new TQGridLayout( gb->layout(), 6, 2 );
 
   lab = new TQLabel( i18n("Legend title color:"), gb );
   grid3->addWidget( lab, 0, 0 );
@@ -177,7 +177,7 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
 
   //it's not good but I don't know how
   //to reduce space
-  tqlayout->addColSpacing( 1, 300 );
+  layout->addColSpacing( 1, 300 );
 }
 
 void KChartLegendConfigPage::init()
@@ -364,7 +364,7 @@ void KChartLegendConfigPage::apply()
         _params->setLegendFontRelSize(textLegend.pointSize());
 }
 
-TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* tqlayout,
+TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* layout,
                                                 TQButtonGroup* gb,
                                                 const TQString &toolTipText,
                                                 const TQString &icon,
@@ -378,7 +378,7 @@ TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* tqlayout,
                               KIcon::DefaultState,
                               KChartFactory::global() ) );
   TQToolTip::add( button, toolTipText );
-  tqlayout->addWidget( button, posY, posX );
+  layout->addWidget( button, posY, posX );
   return button;
 }
 
diff --git a/kchart/kchartLegendConfigPage.h b/kchart/kchartLegendConfigPage.h
index 8419baa8..efab8b31 100644
--- a/kchart/kchartLegendConfigPage.h
+++ b/kchart/kchartLegendConfigPage.h
@@ -23,7 +23,7 @@
 
 #include <tqwidget.h>
 #include <tqbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 class TQVButtonGroup;
 class TQRadioButton;
@@ -64,7 +64,7 @@ private:
     TQPushButton *titleLegendFontButton, *textLegendFontButton;
     TQButton::ToggleState titleLegendIsRelative, textLegendIsRelative;
 
-    TQPushButton* addButton( TQGridLayout* tqlayout, TQButtonGroup* gb,
+    TQPushButton* addButton( TQGridLayout* layout, TQButtonGroup* gb,
                             const TQString &toolTipText, const TQString &icon,
                             int posY, int posX );
 };
diff --git a/kchart/kchartLine3dConfigPage.cc b/kchart/kchartLine3dConfigPage.cc
index adf56a3d..b3a3eaf5 100644
--- a/kchart/kchartLine3dConfigPage.cc
+++ b/kchart/kchartLine3dConfigPage.cc
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kdialog.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqbuttongroup.h>
@@ -67,7 +67,7 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params,
 
   tmpLabel = new TQLabel( i18n( "Rotation around the X-axis in degrees:" ), 
 			 this );
-  tmpLabel->resize( tmpLabel->tqsizeHint() );
+  tmpLabel->resize( tmpLabel->sizeHint() );
   grid1->addWidget(tmpLabel,4,0);
 
   angle3dX=new KIntNumInput(0, this, 10);
@@ -75,7 +75,7 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params,
   angle3dX->setRange(0, 90, 1);
 
   tmpLabel = new TQLabel( i18n( "Rotation around the Y-axis in degrees:" ), this );
-  tmpLabel->resize( tmpLabel->tqsizeHint() );
+  tmpLabel->resize( tmpLabel->sizeHint() );
   grid1->addWidget(tmpLabel,5,0);
 
   angle3dY=new KIntNumInput(0, this, 10);
@@ -84,11 +84,11 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params,
 
 
   tmpLabel = new TQLabel( i18n( "Depth:" ), this );
-  tmpLabel->resize( tmpLabel->tqsizeHint() );
+  tmpLabel->resize( tmpLabel->sizeHint() );
   grid1->addWidget(tmpLabel,6,0);
 
   depth=new KDoubleNumInput(0, this);
-  depth->resize(100,depth->tqsizeHint().height());
+  depth->resize(100,depth->sizeHint().height());
   grid1->addWidget(depth,6,1);
   depth->setRange(0,40, 0.1);
 #endif
@@ -101,7 +101,7 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params,
   grid1->activate();
   //it's not good but I don't know how
   //to reduce space
-  //tqlayout->addColSpacing(1,300);
+  //layout->addColSpacing(1,300);
 }
 
 void KChartLine3dConfigPage::slotChange3DParameter(bool b)
diff --git a/kchart/kchartPageLayout.cc b/kchart/kchartPageLayout.cc
index 8fd9c9d0..6bb5b9fc 100644
--- a/kchart/kchartPageLayout.cc
+++ b/kchart/kchartPageLayout.cc
@@ -22,7 +22,7 @@
 #include "kchart_params.h"
 #include <knumvalidator.h>
 #include <tqlineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <tqlabel.h>
 #include <tqgroupbox.h>
@@ -43,10 +43,10 @@ KChartPageLayout::KChartPageLayout( KChartParams* _params, TQWidget* parent, con
     setMainWidget(page);
 
     // FIXME: The following code is strange, since it is written to
-    // use a grid tqlayout with a standard TQWidget.  However, with the
+    // use a grid layout with a standard TQWidget.  However, with the
     // TQGroupBox, it looks better, and since it actually works, there
     // is no immediate need for rewriting.  In the sake of clarity, it
-    // should be done though, and we should use the tqlayout
+    // should be done though, and we should use the layout
     // capabilities of the groupbox instead..
 
     setButtonText( KDialogBase::User1, i18n("&Reset") );
diff --git a/kchart/kchartParameter3dConfigPage.cc b/kchart/kchartParameter3dConfigPage.cc
index 760c9786..39005e29 100644
--- a/kchart/kchartParameter3dConfigPage.cc
+++ b/kchart/kchartParameter3dConfigPage.cc
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <kdialog.h>
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqbuttongroup.h>
@@ -38,17 +38,17 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params,
                                                           TQWidget* parent ) :
     TQWidget( parent ),m_params( params )
 {
-  TQGridLayout* tqlayout = new TQGridLayout(this, 2, 2,KDialog::marginHint(),KDialog::spacingHint());
+  TQGridLayout* layout = new TQGridLayout(this, 2, 2,KDialog::marginHint(),KDialog::spacingHint());
 
 
   TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, 
 				       i18n("3D Parameters"), this );
-  gb->tqlayout()->setSpacing(KDialog::spacingHint());
-  gb->tqlayout()->setMargin(KDialog::marginHint());
+  gb->layout()->setSpacing(KDialog::spacingHint());
+  gb->layout()->setMargin(KDialog::marginHint());
 
-  // The grid tqlayout inside the buttongroup.
-  TQGridLayout *grid1 = new TQGridLayout(gb->tqlayout(), 5, 3);
-  tqlayout->addWidget(gb,0,0);
+  // The grid layout inside the buttongroup.
+  TQGridLayout *grid1 = new TQGridLayout(gb->layout(), 5, 3);
+  layout->addWidget(gb,0,0);
 
   // The main on/off checkbox.
   bar3d=new TQCheckBox(i18n("3D bar"),gb);
@@ -64,7 +64,7 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params,
   grid1->addWidget(drawShadowColor,1,0);
 
   TQLabel *tmpLabel = new TQLabel( i18n( "Angle:" ), gb );
-  tmpLabel->resize( tmpLabel->tqsizeHint() );
+  tmpLabel->resize( tmpLabel->sizeHint() );
   grid1->addWidget(tmpLabel,2,0);
 
   angle3d=new KIntNumInput(0, gb, 10);
@@ -73,16 +73,16 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params,
   angle3d->setRange(0, 90, 1);
 
   tmpLabel = new TQLabel( i18n( "Depth:" ), gb );
-  tmpLabel->resize( tmpLabel->tqsizeHint() );
+  tmpLabel->resize( tmpLabel->sizeHint() );
   grid1->addWidget(tmpLabel,3,0);
 
   depth=new KDoubleNumInput(0, gb);
   TQWhatsThis::add(depth, i18n("You can set here the depth of the 3D effect from 0 to 2. 0 will give you no depth at all.\nDefault is 1."));
-  depth->resize(100,depth->tqsizeHint().height());
+  depth->resize(100,depth->sizeHint().height());
   grid1->addWidget(depth,3,1);
   depth->setRange(0, 2.0, 0.1);
   
-  gb->tqsetAlignment(TQt::AlignLeft);
+  gb->setAlignment(TQt::AlignLeft);
   grid1->addColSpacing(0,depth->width());
   grid1->addColSpacing(0,angle3d->width());
   grid1->setColStretch(2,1);
@@ -90,7 +90,7 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params,
 
   //it's not good but I don't know how
   //to reduce space
-  //tqlayout->addColSpacing(1,300);
+  //layout->addColSpacing(1,300);
 }
 
 
diff --git a/kchart/kchartParameterConfigPage.cc b/kchart/kchartParameterConfigPage.cc
index bffa3099..cd9e0f03 100644
--- a/kchart/kchartParameterConfigPage.cc
+++ b/kchart/kchartParameterConfigPage.cc
@@ -23,7 +23,7 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
@@ -44,17 +44,17 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params,
                                                       TQWidget* parent ) :
     TQWidget( parent ),_params( params )
 {
-    // toplevel tqlayout
+    // toplevel layout
     TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10 );
 
-    TQGridLayout* tqlayout = new TQGridLayout( 1, 3 );
-    toplevel->addLayout( tqlayout );
+    TQGridLayout* layout = new TQGridLayout( 1, 3 );
+    toplevel->addLayout( layout );
 
     // The "Parameters" button group
     TQButtonGroup* gb1 = new TQButtonGroup( 0, Qt::Vertical, i18n("Parameters"), this );
-    gb1->tqlayout()->setSpacing(KDialog::spacingHint());
-    gb1->tqlayout()->setMargin(KDialog::marginHint());
-    TQGridLayout *grid1 = new TQGridLayout(gb1->tqlayout(),9,1);
+    gb1->layout()->setSpacing(KDialog::spacingHint());
+    gb1->layout()->setMargin(KDialog::marginHint());
+    TQGridLayout *grid1 = new TQGridLayout(gb1->layout(),9,1);
 
     grid = new TQCheckBox( i18n( "Grid" ), gb1 );
     TQWhatsThis::add(grid, i18n("If this is checked, the grid is shown. If you uncheck this option, the grid will not be displayed anymore."));
@@ -93,9 +93,9 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params,
     // The "Settings" button group
     TQButtonGroup* gb2 = new TQButtonGroup( 0, Qt::Vertical, 
 					  i18n("Settings"), this );
-    gb2->tqlayout()->setSpacing(KDialog::spacingHint());
-    gb2->tqlayout()->setMargin(KDialog::marginHint());
-    TQGridLayout *grid2 = new TQGridLayout(gb2->tqlayout(),8,1);
+    gb2->layout()->setSpacing(KDialog::spacingHint());
+    gb2->layout()->setMargin(KDialog::marginHint());
+    TQGridLayout *grid2 = new TQGridLayout(gb2->layout(),8,1);
 
     TQBoxLayout * l = new TQVBoxLayout( grid2 );
 
@@ -160,8 +160,8 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params,
     ylabel2_fmt->setMaximumWidth(130);
     grid2->addWidget(ylabel2_fmt,5,1);
 #endif
-    tqlayout->addWidget(gb1,0,0);
-    tqlayout->addWidget(gb2,0,1);
+    layout->addWidget(gb1,0,0);
+    layout->addWidget(gb2,0,1);
 
 #if 0
     grid1->activate();
diff --git a/kchart/kchartParameterPieConfigPage.cc b/kchart/kchartParameterPieConfigPage.cc
index 632e46d1..0921cced 100644
--- a/kchart/kchartParameterPieConfigPage.cc
+++ b/kchart/kchartParameterPieConfigPage.cc
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
diff --git a/kchart/kchartParameterPolarConfigPage.cc b/kchart/kchartParameterPolarConfigPage.cc
index 807cd54e..63d5e5ee 100644
--- a/kchart/kchartParameterPolarConfigPage.cc
+++ b/kchart/kchartParameterPolarConfigPage.cc
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
diff --git a/kchart/kchartPieConfigPage.cc b/kchart/kchartPieConfigPage.cc
index 9a71b9b1..5bfd36c0 100644
--- a/kchart/kchartPieConfigPage.cc
+++ b/kchart/kchartPieConfigPage.cc
@@ -22,7 +22,7 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <kfontdialog.h>
 
@@ -50,35 +50,35 @@ KChartPieConfigPage::KChartPieConfigPage( KChartParams* params,
 					KDialog::spacingHint());
     // The listview
     list = new TQListView( this );
-    list->resize( list->tqsizeHint() );
+    list->resize( list->sizeHint() );
     grid->addMultiCellWidget(list,0,9,0,0);
     list->addColumn( i18n("Hide Piece") );
     list->setRootIsDecorated( TRUE );
 
     TQLabel* label = new TQLabel( i18n( "Column active:" ), this );
-    label->resize( label->tqsizeHint() );
+    label->resize( label->sizeHint() );
     grid->addWidget( label,0,1);
 
     column = new TQSpinBox(1, data->cols(), 1, this);
-    column->resize(100, column->tqsizeHint().height() );
+    column->resize(100, column->sizeHint().height() );
     grid->addWidget( column,1,1);
 
     column->setValue(col+1);
 
     label = new TQLabel( i18n( "Move piece to:" ), this );
-    label->resize( label->tqsizeHint() );
+    label->resize( label->sizeHint() );
     grid->addWidget( label,2,1);
 
     dist = new TQSpinBox(0, 400, 1, this);
-    dist->resize(100, dist->tqsizeHint().height() );
+    dist->resize(100, dist->sizeHint().height() );
     grid->addWidget( dist,3,1);
 
     label = new TQLabel( i18n( "Explode factor (%):" ), this );
-    label->resize( label->tqsizeHint() );
+    label->resize( label->sizeHint() );
     grid->addWidget( label,4,1);
 
     explose = new TQSpinBox(0, 100, 1, this);
-    explose->resize(100, explose->tqsizeHint().height() );
+    explose->resize(100, explose->sizeHint().height() );
     grid->addWidget( explose,5,1);
 
     grid->addColSpacing(0,list->width());
diff --git a/kchart/kchartPrinterDlg.cc b/kchart/kchartPrinterDlg.cc
index 9bd898d6..1d69a0af 100644
--- a/kchart/kchartPrinterDlg.cc
+++ b/kchart/kchartPrinterDlg.cc
@@ -21,7 +21,7 @@
 */
 
 // TQt includes
-#include <tqlayout.h>
+#include <layout.h>
 
 // KDE includes
 #include <kdebug.h>
@@ -37,9 +37,9 @@ namespace KChart
   : KPrintDialogPage( parent, name )
 {
   setTitle( i18n( "KChart Options" ) );
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
-  tqlayout->setMargin( KDialog::marginHint() );
-  tqlayout->setSpacing( KDialog::spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  layout->setMargin( KDialog::marginHint() );
+  layout->setSpacing( KDialog::spacingHint() );
   txtSizex = new KIntNumInput(this );
   txtSizex->setSuffix("%");
   txtSizex->setMinValue(1);
@@ -51,12 +51,12 @@ namespace KChart
   txtSizey->setMaxValue(100);
   txtSizey->setValue(100);
   
-  tqlayout->addWidget( new TQLabel(i18n("Print Size"), this) );
-  tqlayout->addWidget( new TQLabel(i18n("Width: "), this) );
-  tqlayout->addWidget( txtSizex );
-  tqlayout->addWidget( new TQLabel(i18n("Height: "), this) );
-  tqlayout->addWidget( txtSizey );
-  tqlayout->addStretch( 1 );
+  layout->addWidget( new TQLabel(i18n("Print Size"), this) );
+  layout->addWidget( new TQLabel(i18n("Width: "), this) );
+  layout->addWidget( txtSizex );
+  layout->addWidget( new TQLabel(i18n("Height: "), this) );
+  layout->addWidget( txtSizey );
+  layout->addStretch( 1 );
 }
 
 void KChartPrinterDlg::getOptions( TQMap<TQString, TQString>& opts, bool )
diff --git a/kchart/kchartSubTypeChartPage.cc b/kchart/kchartSubTypeChartPage.cc
index 13585d7a..01afbd1b 100644
--- a/kchart/kchartSubTypeChartPage.cc
+++ b/kchart/kchartSubTypeChartPage.cc
@@ -31,7 +31,7 @@
 #include <tqspinbox.h>
 #include <tqlabel.h>
 #include <tqhgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
 
@@ -56,7 +56,7 @@ KChartHiloSubTypeChartPage::KChartHiloSubTypeChartPage( KChartParams* params,
     subtypeBG->insert( stacked, KDChartParams::AreaStacked );
     percent = new TQRadioButton( i18n("HiLoOpenClose"), subtypeBG );
     subtypeBG->insert( percent, KDChartParams::AreaPercent );
-    subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() );
+    subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() );
     connect( subtypeBG, TQT_SIGNAL( clicked( int ) ),
              this, TQT_SLOT( slotChangeSubType( int ) ) );
 
@@ -64,7 +64,7 @@ KChartHiloSubTypeChartPage::KChartHiloSubTypeChartPage( KChartParams* params,
     TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose."));
     toplevel->addWidget( exampleGB, 2 );
     exampleLA = new TQLabel( exampleGB );
-    exampleLA->tqsetAlignment( AlignCenter | AlignVCenter );
+    exampleLA->setAlignment( AlignCenter | AlignVCenter );
     // PENDING(kalle) Make image scale with available space once TQt 2.2 is out.
 }
 
@@ -135,7 +135,7 @@ KChartAreaSubTypeChartPage::KChartAreaSubTypeChartPage( KChartParams* params,
     subtypeBG->insert( stacked, KDChartParams::AreaStacked );
     percent = new TQRadioButton( i18n( "Percent" ), subtypeBG );
     subtypeBG->insert( percent, KDChartParams::AreaPercent );
-    subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() );
+    subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() );
     connect( subtypeBG, TQT_SIGNAL( clicked( int ) ),
              this, TQT_SLOT( slotChangeSubType( int ) ) );
 
@@ -143,7 +143,7 @@ KChartAreaSubTypeChartPage::KChartAreaSubTypeChartPage( KChartParams* params,
     TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose."));
     toplevel->addWidget( exampleGB, 2 );
     exampleLA = new TQLabel( exampleGB );
-    exampleLA->tqsetAlignment( AlignCenter | AlignVCenter );
+    exampleLA->setAlignment( AlignCenter | AlignVCenter );
     // PENDING(kalle) Make image scale with available space once TQt 2.2 is out.
 }
 
@@ -219,14 +219,14 @@ KChartBarSubTypeChartPage::KChartBarSubTypeChartPage( KChartParams* params,
     percent = new TQRadioButton( i18n( "Percent" ), subtypeBG );
     subtypeBG->insert( percent, KDChartParams::BarPercent );
 
-    subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() );
+    subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() );
     connect( subtypeBG, TQT_SIGNAL( clicked( int ) ),
              this, TQT_SLOT( slotChangeSubType( int ) ) );
 
     //TQHBox   *hbox = new TQHBox( this );
     new TQLabel( i18n( "Number of lines: "), left );
     m_numLines    = new TQSpinBox( left );
-    // FIXME: Use a grid tqlayout instead
+    // FIXME: Use a grid layout instead
     new TQLabel( "", left);
     left->setStretchFactor( left, 1 );
 
@@ -234,7 +234,7 @@ KChartBarSubTypeChartPage::KChartBarSubTypeChartPage( KChartParams* params,
     TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose."));
     toplevel->addWidget( exampleGB, 2 );
     exampleLA = new TQLabel( exampleGB );
-    exampleLA->tqsetAlignment( AlignCenter | AlignVCenter );
+    exampleLA->setAlignment( AlignCenter | AlignVCenter );
 }
 
 void KChartBarSubTypeChartPage::init()
@@ -309,7 +309,7 @@ KChartLineSubTypeChartPage::KChartLineSubTypeChartPage( KChartParams* params,
     subtypeBG->insert( stacked, KDChartParams::AreaStacked );
     percent = new TQRadioButton( i18n( "Percent" ), subtypeBG );
     subtypeBG->insert( percent, KDChartParams::AreaPercent );
-    subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() );
+    subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() );
     connect( subtypeBG, TQT_SIGNAL( clicked( int ) ),
              this, TQT_SLOT( slotChangeSubType( int ) ) );
 
@@ -317,7 +317,7 @@ KChartLineSubTypeChartPage::KChartLineSubTypeChartPage( KChartParams* params,
     TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose."));
     toplevel->addWidget( exampleGB, 2 );
     exampleLA = new TQLabel( exampleGB );
-    exampleLA->tqsetAlignment( AlignCenter | AlignVCenter );
+    exampleLA->setAlignment( AlignCenter | AlignVCenter );
     // PENDING(kalle) Make image scale with available space once TQt 2.2 is out.
 }
 
@@ -388,7 +388,7 @@ KChartPolarSubTypeChartPage::KChartPolarSubTypeChartPage( KChartParams* params,
     subtypeBG->insert( stacked, KDChartParams::AreaStacked );
     percent = new TQRadioButton( i18n( "Percent" ), subtypeBG );
     subtypeBG->insert( percent, KDChartParams::AreaPercent );
-    subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() );
+    subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() );
     connect( subtypeBG, TQT_SIGNAL( clicked( int ) ),
              this, TQT_SLOT( slotChangeSubType( int ) ) );
 
@@ -396,7 +396,7 @@ KChartPolarSubTypeChartPage::KChartPolarSubTypeChartPage( KChartParams* params,
     TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose."));
     toplevel->addWidget( exampleGB, 2 );
     exampleLA = new TQLabel( exampleGB );
-    exampleLA->tqsetAlignment( AlignCenter | AlignVCenter );
+    exampleLA->setAlignment( AlignCenter | AlignVCenter );
     // PENDING(kalle) Make image scale with available space once TQt 2.2 is out.
 }
 
diff --git a/kchart/kchartWizardLabelsLegendPage.cc b/kchart/kchartWizardLabelsLegendPage.cc
index 396264d8..4389ce07 100644
--- a/kchart/kchartWizardLabelsLegendPage.cc
+++ b/kchart/kchartWizardLabelsLegendPage.cc
@@ -8,7 +8,7 @@
 #include <tqlabel.h>
 #include <klocale.h>
 #include <kfontdialog.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqcolor.h>
 
diff --git a/kchart/kchartWizardSelectChartSubTypePage.cc b/kchart/kchartWizardSelectChartSubTypePage.cc
index 74804042..deeca478 100644
--- a/kchart/kchartWizardSelectChartSubTypePage.cc
+++ b/kchart/kchartWizardSelectChartSubTypePage.cc
@@ -10,7 +10,7 @@
 #include <tqlabel.h>
 #include <tqptrcollection.h>
 #include <tqobjectlist.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 
 #include <kdebug.h>
@@ -44,7 +44,7 @@ KChartWizardSelectChartSubTypePage::KChartWizardSelectChartSubTypePage( TQWidget
     TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, 
 					  i18n( "Chart Sub Type" ), this );
     grp->setRadioButtonExclusive( true );
-    grp->tqlayout();
+    grp->layout();
     lay1->addWidget(grp);
     m_normal  = new TQRadioButton( i18n( "Normal" ),  grp );
     m_stacked = new TQRadioButton( i18n( "Stacked" ), grp );
diff --git a/kchart/kchartWizardSelectChartTypePage.cc b/kchart/kchartWizardSelectChartTypePage.cc
index 9928c2db..dc4cbf8a 100644
--- a/kchart/kchartWizardSelectChartTypePage.cc
+++ b/kchart/kchartWizardSelectChartTypePage.cc
@@ -28,8 +28,8 @@ KChartButton::KChartButton(TQWidget *parent, const TQString & _text, const TQPix
 
   // The text
   TQLabel *label = new TQLabel(_text, this);
-  label->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
-  tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed);
+  label->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
+  setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed);
 }
 
 KChartButton::~KChartButton()
diff --git a/kchart/kchartWizardSelectChartTypePage.h b/kchart/kchartWizardSelectChartTypePage.h
index 2fb8d612..bc39b505 100644
--- a/kchart/kchartWizardSelectChartTypePage.h
+++ b/kchart/kchartWizardSelectChartTypePage.h
@@ -1,7 +1,7 @@
 #ifndef _kchartWIZARDSELECTCHARTTYPEPAGE_H
 #define _kchartWIZARDSELECTCHARTTYPEPAGE_H
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqwidget.h>
 
diff --git a/kchart/kchartWizardSelectDataFormatPage.cc b/kchart/kchartWizardSelectDataFormatPage.cc
index 38606259..588d1635 100644
--- a/kchart/kchartWizardSelectDataFormatPage.cc
+++ b/kchart/kchartWizardSelectDataFormatPage.cc
@@ -5,7 +5,7 @@
 
 #include <tqhbox.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
@@ -51,10 +51,10 @@ KChartWizardSelectDataFormatPage::KChartWizardSelectDataFormatPage( TQWidget* pa
     TQButtonGroup *gb = new TQVButtonGroup( i18n( "Data Format" ), this );
 
     m_rowMajor = new TQRadioButton( i18n( "Data in rows" ), gb );
-    m_rowMajor->resize( m_rowMajor->tqsizeHint() );
+    m_rowMajor->resize( m_rowMajor->sizeHint() );
 
     m_colMajor = new TQRadioButton( i18n( "Data in columns" ), gb );
-    m_colMajor->resize( m_colMajor->tqsizeHint() );
+    m_colMajor->resize( m_colMajor->sizeHint() );
 
     grid1->addWidget(gb, 3, 0);
 
diff --git a/kchart/kchartWizardSetupAxesPage.cc b/kchart/kchartWizardSetupAxesPage.cc
index 76be1f0d..b3734e13 100644
--- a/kchart/kchartWizardSetupAxesPage.cc
+++ b/kchart/kchartWizardSetupAxesPage.cc
@@ -7,7 +7,7 @@
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kfontdialog.h>
 #include <knumvalidator.h>
diff --git a/kchart/kchartWizardSetupDataPage.cc b/kchart/kchartWizardSetupDataPage.cc
index b2ba26ac..1d057d4c 100644
--- a/kchart/kchartWizardSetupDataPage.cc
+++ b/kchart/kchartWizardSetupDataPage.cc
@@ -22,7 +22,7 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent,
   tmpTQGroupBox = new TQButtonGroup( this, "GroupBox_1" );
   tmpTQGroupBox->setGeometry( 260, 10, 130, 80 );
   tmpTQGroupBox->setFrameStyle( 49 );
-  tmpTQGroupBox->tqsetAlignment( 1 );
+  tmpTQGroupBox->setAlignment( 1 );
 
   datarow = new TQRadioButton( this, "RadioButton_1" );
   datarow->setGeometry( 270, 40, 100, 20 );
@@ -57,7 +57,7 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent,
   tmpTQLabel = new TQLabel( this, "Label_4" );
   tmpTQLabel->setGeometry( 280, 110, 100, 30 );
   tmpTQLabel->setText( i18n("Use first row as description") );
-  tmpTQLabel->tqsetAlignment( 1313 );
+  tmpTQLabel->setAlignment( 1313 );
 
   rowdescript = new TQCheckBox( this, "CheckBox_4" );
   rowdescript->setGeometry( 260, 150, 20, 30 );
@@ -69,7 +69,7 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent,
   tmpTQLabel = new TQLabel( this, "Label_5" );
   tmpTQLabel->setGeometry( 280, 150, 100, 30 );
   tmpTQLabel->setText( i18n("Use first column as description") );
-  tmpTQLabel->tqsetAlignment( 1313 );
+  tmpTQLabel->setAlignment( 1313 );
 
   TQFrame* tmpTQFrame;
   tmpTQFrame = new TQFrame( this, "Frame_1" );
diff --git a/kchart/kchart_params.cc b/kchart/kchart_params.cc
index ddf3d1b4..55a158d7 100644
--- a/kchart/kchart_params.cc
+++ b/kchart/kchart_params.cc
@@ -252,7 +252,7 @@ bool KChartParams::loadOasis( const TQDomElement     &chartElem,
 
     // If we can't find out what charttype it is, we might as well end here.
     if ( !knownType ) {
-        errorMessage = i18n( "Unknown chart type %1" ).tqarg( chartClass );
+        errorMessage = i18n( "Unknown chart type %1" ).arg( chartClass );
         kdDebug(35001) << errorMessage << endl;
         return false;
     }
@@ -701,7 +701,7 @@ bool KChartParams::loadOasisAxis( const TQDomElement      &axisElem,
 
     // chart:visible                - true if labels + ticks should be shown.
 
-    // tqchildren:
+    // children:
     // chart:
     // chart:
     // chart:
diff --git a/kchart/kchart_part.cc b/kchart/kchart_part.cc
index f0fda2f0..358f5ab7 100644
--- a/kchart/kchart_part.cc
+++ b/kchart/kchart_part.cc
@@ -30,7 +30,7 @@ using std::cerr;
 #include <kdebug.h>
 
 #include <tqdom.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqbuffer.h>
 #include <tqpainter.h>
 
@@ -225,12 +225,12 @@ void KChartPart::generateBarChartTemplate()
 
 		// Fill column label, but only on the first iteration.
 		if (row == 0) {
-		    m_colLabels << i18n("Column %1").tqarg(col + 1);
+		    m_colLabels << i18n("Column %1").arg(col + 1);
 		}
             }
 
 	    // Fill row label.
-	    m_rowLabels << i18n("Row %1").tqarg(row + 1);
+	    m_rowLabels << i18n("Row %1").arg(row + 1);
 	}
     }
 
@@ -994,7 +994,7 @@ bool KChartPart::loadOasis( const TQDomDocument& doc,
         if ( localName.isEmpty() )
             setErrorMessage( i18n( "Invalid OASIS OpenDocument file. No tag found inside office:body." ) );
         else
-            setErrorMessage( i18n( "This document is not a chart, but %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) );
+            setErrorMessage( i18n( "This document is not a chart, but %1. Please try opening it with the appropriate application." ).arg( KoDocument::tagNameToDocumentType( localName ) ) );
 
         return false;
     }
diff --git a/kchart/kchart_view.cc b/kchart/kchart_view.cc
index 5b1cc6b2..b009e1ca 100644
--- a/kchart/kchart_view.cc
+++ b/kchart/kchart_view.cc
@@ -678,7 +678,7 @@ void KChartView::importData()
     TQFile  inFile(filename);
     if (!inFile.open(IO_ReadOnly)) {
 	KMessageBox::sorry( 0, i18n("The file %1 could not be read.")
-			    .tqarg(filename) );
+			    .arg(filename) );
 	inFile.close();
 	return;
     }
diff --git a/kchart/kdchart/KDChart.cpp b/kchart/kdchart/KDChart.cpp
index 415f013a..4d8fd0c8 100644
--- a/kchart/kdchart/KDChart.cpp
+++ b/kchart/kdchart/KDChart.cpp
@@ -302,7 +302,7 @@ void KDChart::paint( TQPainter*              painter,
         }
         //qDebug("xxx" );
         if( (params || data) && !setupGeometry( painter, params, data, drawRect ) ){
-            qDebug("ERROR: KDChart::paint() could not calculate the chart tqgeometry.");
+            qDebug("ERROR: KDChart::paint() could not calculate the chart geometry.");
             bOk = false;
         }
     }else{
@@ -388,7 +388,7 @@ void KDChart::initInterpreter( TQSInterpreter* interpreter )
 
 void KDChart::initProject( TQSProject* project )
 {
-    project->createScript( TQString::tqfromLatin1( "KDCHART_Globals" ), globals() );
+    project->createScript( TQString::fromLatin1( "KDCHART_Globals" ), globals() );
     privateInitInterpreter( project->interpreter() );
 }
 
@@ -431,20 +431,20 @@ TQString KDChart::globals()
 
     for( TQMapIterator<char*,double> it= intMap.begin(); it != intMap.end(); ++it ) {
         // This is written this way to be efficient
-        globals += TQString::tqfromLatin1( "const " );
+        globals += TQString::fromLatin1( "const " );
         globals += it.key();
         globals += " = ";
         globals += TQString::number( it.data() );
         globals += ";\n";
     }
 
-    globals += TQString::tqfromLatin1( "const KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT=\"%1\";\n" )
-               .tqarg( TQString::tqfromLatin1( KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT ) );
-    globals += TQString::tqfromLatin1( "const KDCHART_AXIS_LABELS_AUTO_LIMIT = 140319.64;\n" );
-    globals += TQString::tqfromLatin1( "const KDCHART_DEFAULT_AXIS_GRID_COLOR = new Color(\"%1\");\n" )
-               .tqarg(KDCHART_DEFAULT_AXIS_GRID_COLOR.name());
-    globals += TQString::tqfromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" )
-               .tqarg( (KDCHART_DATA_VALUE_AUTO_COLOR)->name());
+    globals += TQString::fromLatin1( "const KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT=\"%1\";\n" )
+               .arg( TQString::fromLatin1( KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT ) );
+    globals += TQString::fromLatin1( "const KDCHART_AXIS_LABELS_AUTO_LIMIT = 140319.64;\n" );
+    globals += TQString::fromLatin1( "const KDCHART_DEFAULT_AXIS_GRID_COLOR = new Color(\"%1\");\n" )
+               .arg(KDCHART_DEFAULT_AXIS_GRID_COLOR.name());
+    globals += TQString::fromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" )
+               .arg( (KDCHART_DATA_VALUE_AUTO_COLOR)->name());
 
 
     TQMap<char*,TQColor> colorMap;
@@ -469,14 +469,14 @@ TQString KDChart::globals()
     colorMap.insert( "TQt.darkYellow", TQt::darkYellow );
     for( TQMapIterator<char*,TQColor> it2= colorMap.begin(); it2 != colorMap.end(); ++it2 ) {
         // This is written this way to be efficient
-        globals += TQString::tqfromLatin1( it2.key() );
-        globals += TQString::tqfromLatin1( " = new Color( " );
+        globals += TQString::fromLatin1( it2.key() );
+        globals += TQString::fromLatin1( " = new Color( " );
         globals += TQString::number( it2.data().red() );
         globals += ',';
         globals += TQString::number( it2.data().green() );
         globals += ',';
         globals += TQString::number( it2.data().blue() );
-        globals += TQString::tqfromLatin1( " );\n" );
+        globals += TQString::fromLatin1( " );\n" );
     }
     //qDebug( "%s",globals.latin1() );
     return globals;
diff --git a/kchart/kdchart/KDChartAreaPainter.cpp b/kchart/kdchart/KDChartAreaPainter.cpp
index 6c47aeed..2fca8d62 100644
--- a/kchart/kdchart/KDChartAreaPainter.cpp
+++ b/kchart/kdchart/KDChartAreaPainter.cpp
@@ -43,7 +43,7 @@
 KDChartLinesPainter( params )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 
diff --git a/kchart/kdchart/KDChartAxesPainter.cpp b/kchart/kdchart/KDChartAxesPainter.cpp
index 6124abe8..ee9dc879 100644
--- a/kchart/kdchart/KDChartAxesPainter.cpp
+++ b/kchart/kdchart/KDChartAxesPainter.cpp
@@ -65,7 +65,7 @@ int secondsSinceUTCStart( const TQDateTime& dt )
 KDChartPainter( params )
 {
     // Intentionally left blank.
-    // We cannot setup the tqgeometry yet
+    // We cannot setup the geometry yet
     // since we do not know the size of the painter.
 }
 
@@ -680,7 +680,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
                                 anchor.setY( p2.y() + static_cast < int > ( pYDelta * (iLabel - 0.5) ) );
 
                                 // allow for shearing and/or scaling of the painter
-                                anchor = painter->tqworldMatrix().map( anchor );
+                                anchor = painter->worldMatrix().map( anchor );
 
                                 TQString text;
                                 if( cv.isDateTime ){
@@ -1762,7 +1762,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
 				  KDDrawText::drawRotatedText(
 						painter,
 						nRotation,
-						painter->tqworldMatrix().map(
+						painter->worldMatrix().map(
                                                 TQPoint( static_cast<int>( cv.pTextsX ),
                                                         static_cast<int>( cv.pTextsY ) ) ),
                                                 label,
@@ -2823,7 +2823,7 @@ void KDChartAxesPainter::calculateLabelTexts(
                     const double secHour  = 60.0 * secMin;
                     const double secDay   = 24.0 * secHour;
                     //
-                    // we temporarily disable week tqalignment until bug
+                    // we temporarily disable week alignment until bug
                     // is fixed (1st week of year must not start in the
                     // preceeding year but rather be shown incompletely)
                     //
@@ -3661,7 +3661,7 @@ TQString KDChartAxesPainter::truncateBehindComma( const double nVal,
     sVal.setNum( nVal, 'f', bUseAutoDigits ? nTrustedPrecision
                                            : TQMIN(behindComma, nTrustedPrecision) );
     //qDebug("nVal: %f    sVal: "+sVal, nVal );
-    //qDebug( TQString("                     %1").tqarg(sVal));
+    //qDebug( TQString("                     %1").arg(sVal));
     if ( bUseAutoDigits ) {
         int comma = sVal.find( '.' );
         if ( -1 < comma ) {
@@ -3697,7 +3697,7 @@ TQString KDChartAxesPainter::truncateBehindComma( const double nVal,
             }
         }
     }
-    //qDebug( TQString("                       -  %1").tqarg(trueBehindComma));
+    //qDebug( TQString("                       -  %1").arg(trueBehindComma));
     return sVal;
 }
 
@@ -4424,7 +4424,7 @@ void KDChartAxesPainter::paintData( TQPainter* painter,
     //ourClipRect.setLeft( ourClipRect.left() + 1 );
     //ourClipRect.setRight( ourClipRect.right() - 1 );
 
-    const TQWMatrix & world = painter->tqworldMatrix();
+    const TQWMatrix & world = painter->worldMatrix();
     ourClipRect =
 #if COMPAT_TQT_VERSION >= 0x030000
     world.mapRect( ourClipRect );
diff --git a/kchart/kdchart/KDChartAxisParams.cpp b/kchart/kdchart/KDChartAxisParams.cpp
index a6e337f2..b24892b1 100644
--- a/kchart/kdchart/KDChartAxisParams.cpp
+++ b/kchart/kdchart/KDChartAxisParams.cpp
@@ -297,7 +297,7 @@ become wider or more narrow.
 Also the graphical representation of the date will be comparable
 since all your charts will use the same scale if you wish this.
 
-- Let the program calculate the chart tqlayout based upon the kind
+- Let the program calculate the chart layout based upon the kind
 of and width of the labels to be drawn at the axes.
 Also the program can calculate the labels for you and find the
 boundary values for start and end of the scale automatically.
diff --git a/kchart/kdchart/KDChartAxisParams.h b/kchart/kdchart/KDChartAxisParams.h
index b5819709..c2f9be9c 100644
--- a/kchart/kdchart/KDChartAxisParams.h
+++ b/kchart/kdchart/KDChartAxisParams.h
@@ -33,7 +33,7 @@
 #include <tqcolor.h>
 #include <tqmap.h>
 #include <tqobject.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstringlist.h>
 #include <tqdatetime.h>
 #include <tqvariant.h>
diff --git a/kchart/kdchart/KDChartBWPainter.cpp b/kchart/kdchart/KDChartBWPainter.cpp
index 9f6e5fb5..7fed7520 100644
--- a/kchart/kdchart/KDChartBWPainter.cpp
+++ b/kchart/kdchart/KDChartBWPainter.cpp
@@ -55,7 +55,7 @@
 KDChartAxesPainter( params )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 
@@ -291,7 +291,7 @@ void KDChartBWPainter::specificPaintData( TQPainter* painter,
 
     const bool noBrush = TQt::NoBrush == params()->bWChartBrush().style();
 
-    // Loop over the datasets, draw one box and whisker tqshape for each series.
+    // Loop over the datasets, draw one box and whisker shape for each series.
     for ( uint dataset  = chartDatasetStart;
             dataset <= chartDatasetEnd;
             ++dataset ) {
diff --git a/kchart/kdchart/KDChartBarPainter.cpp b/kchart/kdchart/KDChartBarPainter.cpp
index f8ae89d2..8bfe1a76 100644
--- a/kchart/kdchart/KDChartBarPainter.cpp
+++ b/kchart/kdchart/KDChartBarPainter.cpp
@@ -48,7 +48,7 @@ KDChartBarPainter::KDChartBarPainter( KDChartParams* params ) :
     KDChartAxesPainter( params )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 
@@ -226,7 +226,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
                                      ? 0.0
                                      : static_cast<int>( valueBlockGap ) * numValues;
 
-    // Set some tqgeometry values that apply to bar charts only
+    // Set some geometry values that apply to bar charts only
     double totalNumberOfBars = 0.0;
     double spaceBetweenDatasets = 0.0;
     switch ( params()->barChartSubType() ) {
diff --git a/kchart/kdchart/KDChartCustomBox.cpp b/kchart/kdchart/KDChartCustomBox.cpp
index 9b4d7855..7066e889 100644
--- a/kchart/kdchart/KDChartCustomBox.cpp
+++ b/kchart/kdchart/KDChartCustomBox.cpp
@@ -28,7 +28,7 @@
  **********************************************************************/
 #include <tqpainter.h>
 #include <tqregion.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpoint.h>
 #include <tqsimplerichtext.h>
 #include <tqpaintdevicemetrics.h>
diff --git a/kchart/kdchart/KDChartCustomBox.h b/kchart/kdchart/KDChartCustomBox.h
index 223920e4..2e1edf1a 100644
--- a/kchart/kdchart/KDChartCustomBox.h
+++ b/kchart/kdchart/KDChartCustomBox.h
@@ -30,7 +30,7 @@
 #define __KDCHARTCUSTOMBOX_H__
 
 #include <tqobject.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfont.h>
 #include <tqdom.h>
 #include "KDChartGlobal.h"
@@ -181,7 +181,7 @@ public:
       \param deltaAlign The way how \c deltaX and \deltaY affect the position of the box.
       Leave this parameter to its default value KDCHART_AlignAuto to have the delta values
       used according to the box's main \c align settings, otherwise specify your own
-      tqalignment settings: e.g. right means there will be a gap between the right side of
+      alignment settings: e.g. right means there will be a gap between the right side of
       the box and its anchor point - if the main \c align parameter is set to right too
       the anchor point will to be outside of the box / if \c align is set to left
       (but the \c deltaAlign to right) the anchor point will be inside the box.
@@ -192,7 +192,7 @@ public:
       \li \c TQt::AlignRight | TQt::AlignTop
       \li \c TQt::AlignRight | TQt::AlignBottom
       Using AlignVCenter or AlignHCenter or AlignCenter does not make sense here:
-      center delta tqalignment will cause KDChart to ignore the respective delta
+      center delta alignment will cause KDChart to ignore the respective delta
       settings: deltaX or deltaY or both will become ineffective.
       \param deltaScaleGlobal If true the actual delta X and delta Y values will
       be calculated by \c deltaX and \c deltaY based upon the size of the
@@ -297,7 +297,7 @@ public:
       \param deltaAlign The way how \c deltaX and \deltaY affect the position of the box.
       Leave this parameter to its default value KDCHART_AlignAuto to have the delta values
       used according to the box's main \c align settings, otherwise specify your own
-      tqalignment settings: e.g. TQt::AlignRight means the box will be moved to the left
+      alignment settings: e.g. TQt::AlignRight means the box will be moved to the left
       (by the amount calculated using the \c deltaX value), so there will be a gap
       between the right side of the box and its anchor point IF the main \c align flag
       is set to TQt::AlignRight too, so the anchor point will to be outside of the
@@ -310,7 +310,7 @@ public:
       \li \c TQt::AlignRight | TQt::AlignTop
       \li \c TQt::AlignRight | TQt::AlignBottom
       Using AlignVCenter or AlignHCenter or AlignCenter does not make sense here:
-      center delta tqalignment will cause KDChart to ignore the respective delta
+      center delta alignment will cause KDChart to ignore the respective delta
       settings: deltaX or deltaY or both will become ineffective.
       \note Moving of the box due to \c deltaAlign settings is applied after
       the box is rotated: e.g. this means a gap specified by \c deltaAlign = TQt::AlignTop
@@ -643,7 +643,7 @@ public slots: // PENDING(blackie) merge slots sections.
 
       Set this to KDHART_KDCHART_AlignAuto to have the delta values
       used according to the box's main \c align settings, otherwise specify your own
-      tqalignment settings: e.g. right means there will be a gap between the right side of
+      alignment settings: e.g. right means there will be a gap between the right side of
       the box and its anchor point - if the main \c align parameter is set to right too
       the anchor point will to be outside of the box / if \c align is set to left
       (but the \c deltaAlign to right) the anchor point will be inside the box.
@@ -654,7 +654,7 @@ public slots: // PENDING(blackie) merge slots sections.
       \li \c TQt::AlignRight | TQt::AlignTop
       \li \c TQt::AlignRight | TQt::AlignBottom
       Using AlignVCenter or AlignHCenter or AlignCenter does not make sense here:
-      center delta tqalignment will cause KDChart to ignore the respective delta
+      center delta alignment will cause KDChart to ignore the respective delta
       settings: deltaX or deltaY or both will become ineffective.
       \note Moving of the box due to \c deltaAlign settings is applied after
       the box is rotated: e.g. this means a gap specified by \c deltaAlign = TQt::AlignTop
diff --git a/kchart/kdchart/KDChartDataIntern.h b/kchart/kdchart/KDChartDataIntern.h
index a1d6562b..fe8cfc8f 100644
--- a/kchart/kdchart/KDChartDataIntern.h
+++ b/kchart/kdchart/KDChartDataIntern.h
@@ -231,7 +231,7 @@ public:
                 }
             }
             // Note: We do *not* compare the _propSetID here since it contains
-            //       no values but is used to handle some tqlayout information...
+            //       no values but is used to handle some layout information...
         }
         return bRet;
     }
@@ -289,7 +289,7 @@ public:
                 /* NOOP */;
             }
             // Note: We do *not* copy the _propSetID here since it contains
-            //       no values but is used to handle some tqlayout information...
+            //       no values but is used to handle some layout information...
         }
     }
 
diff --git a/kchart/kdchart/KDChartEnums.h b/kchart/kdchart/KDChartEnums.h
index 82956e8c..71373d56 100644
--- a/kchart/kdchart/KDChartEnums.h
+++ b/kchart/kdchart/KDChartEnums.h
@@ -53,10 +53,10 @@ class KDCHART_EXPORT KDChartEnums :public TQObject
 
 public:
     /**
-      Text tqlayout policy: what to do if text that is to be drawn would
+      Text layout policy: what to do if text that is to be drawn would
       cover neighboring text or neighboring areas.
 
-      \li \c LayoutJustOverwrite Just ignore the tqlayout collision and write the text nevertheless.
+      \li \c LayoutJustOverwrite Just ignore the layout collision and write the text nevertheless.
       \li \c LayoutPolicyRotate Try counter-clockwise rotation to make the text fit into the space.
       \li \c LayoutPolicyShiftVertically Shift the text baseline upwards (or downwards, resp.) and draw a connector line between the text and its anchor.
       \li \c LayoutPolicyShiftHorizontally Shift the text baseline to the left (or to the right, resp.) and draw a connector line between the text and its anchor.
@@ -71,11 +71,11 @@ public:
         LayoutPolicyShrinkFontSize };
 
     /**
-      Converts the specified text tqlayout policy enum to a
+      Converts the specified text layout policy enum to a
       string representation.
 
-      \param type the text tqlayout policy to convert
-      \return the string representation of the text tqlayout policy enum
+      \param type the text layout policy to convert
+      \return the string representation of the text layout policy enum
       */
     static TQString layoutPolicyToString( TextLayoutPolicy type ) {
         switch( type ) {
@@ -90,7 +90,7 @@ public:
             case LayoutPolicyShrinkFontSize:
                 return "ShrinkFontSize";
             default: // should not happen
-                qDebug( "Unknown text tqlayout policy" );
+                qDebug( "Unknown text layout policy" );
                 return "JustOverwrite";
         }
     }
@@ -150,10 +150,10 @@ public:
 
 
     /**
-      Converts the specified string to a text tqlayout policy enum value.
+      Converts the specified string to a text layout policy enum value.
 
       \param string the string to convert
-      \return the text tqlayout policy enum value
+      \return the text layout policy enum value
       */
     static TextLayoutPolicy stringToLayoutPolicy( const TQString& string ) {
         if( string ==      "JustOverwrite" )
@@ -240,7 +240,7 @@ public:
       \image html "../refman_images/positions.png"
       \image latex "../refman_images/positions.png" "the PositionFlag enum" width=4in
 
-      \note The position and tqalignment of content to be printed at (or
+      \note The position and alignment of content to be printed at (or
       inside of, resp.) an area or a point -- like for printing data value texts next
       to their graphical representations (which might be a bar, line, pie slice,...) --
       is specified by two parameters: a \c PositionFlag and a uint holding a combination of \c TQt::AlignmentFlags.
@@ -249,10 +249,10 @@ public:
 
       The position of content and the way it is aligned to this
       position is shown in the following drawing, note that annotation #2 and annotation #3
-      share the same PositionFlag but have different tqalignment flags set:
+      share the same PositionFlag but have different alignment flags set:
 
-      \image html "../refman_images/tqalignment.png"
-      \image latex "../refman_images/tqalignment.png" "positioning and aligning" width=4in
+      \image html "../refman_images/alignment.png"
+      \image latex "../refman_images/alignment.png" "positioning and aligning" width=4in
 
       \sa KDChartParams::setPrintDataValues
     */
diff --git a/kchart/kdchart/KDChartHiLoPainter.cpp b/kchart/kdchart/KDChartHiLoPainter.cpp
index bb8b2e39..d8f766c2 100644
--- a/kchart/kdchart/KDChartHiLoPainter.cpp
+++ b/kchart/kdchart/KDChartHiLoPainter.cpp
@@ -49,7 +49,7 @@
 KDChartAxesPainter( params )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 
diff --git a/kchart/kdchart/KDChartLinesPainter.cpp b/kchart/kdchart/KDChartLinesPainter.cpp
index a7e01092..9f0995e8 100644
--- a/kchart/kdchart/KDChartLinesPainter.cpp
+++ b/kchart/kdchart/KDChartLinesPainter.cpp
@@ -56,7 +56,7 @@ KDChartLinesPainter::KDChartLinesPainter( KDChartParams* params ) :
     KDChartAxesPainter( params )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 
diff --git a/kchart/kdchart/KDChartObjectFactory.cpp b/kchart/kdchart/KDChartObjectFactory.cpp
index b1dac73e..a53f84c0 100644
--- a/kchart/kdchart/KDChartObjectFactory.cpp
+++ b/kchart/kdchart/KDChartObjectFactory.cpp
@@ -15,42 +15,42 @@
 // PENDING(blackie) Clean up code in this file, so it uses the correct getter methods like getBool.
 KDChartObjectFactory::KDChartObjectFactory()
 {
-    registerClass( TQString::tqfromLatin1( "KDChartWidget" ) );
-    registerClass( TQString::tqfromLatin1( "KDChartParams" ), new KDChartParams );
-    registerClass( TQString::tqfromLatin1( "KDChartTableData" ) );
-    registerClass( TQString::tqfromLatin1( "KDChartAxisParams" ), new KDChartAxisParams );
-    registerClass( TQString::tqfromLatin1( "KDChartEnums" ), 0, new KDChartEnums );
-    registerClass( TQString::tqfromLatin1( "KDChartTextPiece" ) );
-    registerClass( TQString::tqfromLatin1( "KDChartCustomBox" ), new KDChartCustomBox );
-    registerClass( TQString::tqfromLatin1( "KDChartPropertySet" ), new KDChartPropertySet );
-    registerClass( TQString::tqfromLatin1( "KDFrame" ), TQString(), new KDFrame );
-
-    registerClass( TQString::tqfromLatin1( "TQt" ), TQString(), new TQtFactory() );
-    registerClass( TQString::tqfromLatin1( "TQFont" ), TQString(), new TQFontFactory );
+    registerClass( TQString::fromLatin1( "KDChartWidget" ) );
+    registerClass( TQString::fromLatin1( "KDChartParams" ), new KDChartParams );
+    registerClass( TQString::fromLatin1( "KDChartTableData" ) );
+    registerClass( TQString::fromLatin1( "KDChartAxisParams" ), new KDChartAxisParams );
+    registerClass( TQString::fromLatin1( "KDChartEnums" ), 0, new KDChartEnums );
+    registerClass( TQString::fromLatin1( "KDChartTextPiece" ) );
+    registerClass( TQString::fromLatin1( "KDChartCustomBox" ), new KDChartCustomBox );
+    registerClass( TQString::fromLatin1( "KDChartPropertySet" ), new KDChartPropertySet );
+    registerClass( TQString::fromLatin1( "KDFrame" ), TQString(), new KDFrame );
+
+    registerClass( TQString::fromLatin1( "TQt" ), TQString(), new TQtFactory() );
+    registerClass( TQString::fromLatin1( "TQFont" ), TQString(), new TQFontFactory );
 }
 
 TQObject* KDChartObjectFactory::create( const TQString& className, const TQSArgumentList& args, TQObject* /*context*/ )
 {
-    if ( className == TQString::tqfromLatin1( "KDChartWidget" ) )
+    if ( className == TQString::fromLatin1( "KDChartWidget" ) )
          return createKDChartWidget( args );
 
-    if ( className == TQString::tqfromLatin1("KDChartParams") )
+    if ( className == TQString::fromLatin1("KDChartParams") )
         return new KDChartParams();
 
-    else if ( className == TQString::tqfromLatin1("KDChartTableData") )
+    else if ( className == TQString::fromLatin1("KDChartTableData") )
         return createKDChartTableData( args );
 
-    else if ( className == TQString::tqfromLatin1("KDChartAxisParams") )
+    else if ( className == TQString::fromLatin1("KDChartAxisParams") )
         return new KDChartAxisParams();
 
 
-    else if ( className == TQString::tqfromLatin1( "KDChartTextPiece" ) )
+    else if ( className == TQString::fromLatin1( "KDChartTextPiece" ) )
         return createKDChartTextPiece( args );
 
-    else if ( className == TQString::tqfromLatin1( "KDChartCustomBox" ) )
+    else if ( className == TQString::fromLatin1( "KDChartCustomBox" ) )
         return createKDChartCustomBox( args );
 
-    else if ( className == TQString::tqfromLatin1( "KDChartPropertySet" ) )
+    else if ( className == TQString::fromLatin1( "KDChartPropertySet" ) )
         return createKDChartPropertySet( args );
 
     else
@@ -98,7 +98,7 @@ TQObject* KDChartObjectFactory::createKDChartTextPiece( const TQSArgumentList& a
 
     TQString str;
     if ( !getString( args, 1, &str, "KDChartTextPiece" ) ) return 0;
-    if ( !checkIsTQtVariant( args, 2, TQVariant::Font, TQString::tqfromLatin1( "TQFont" ), "KDChartTextPiece" ) ) return 0;
+    if ( !checkIsTQtVariant( args, 2, TQVariant::Font, TQString::fromLatin1( "TQFont" ), "KDChartTextPiece" ) ) return 0;
     TQFont font = args[1].variant().toFont();
 
     return new KDChartTextPiece( str, font );
@@ -145,13 +145,13 @@ TQObject* KDChartObjectFactory::createKDChartCustomBox( const TQSArgumentList& a
 
         TQColor color = TQt::black;
         if ( args.count() >= 9 ) {
-            if ( !checkIsTQtVariant( args, 9, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0;
+            if ( !checkIsTQtVariant( args, 9, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0;
             color = args[8].variant().toColor();
         }
 
         TQBrush paper = TQt::NoBrush;
         if ( args.count() >= 10 ) {
-            if ( !checkIsTQtVariant( args, 10, TQVariant::Brush, TQString::tqfromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0;
+            if ( !checkIsTQtVariant( args, 10, TQVariant::Brush, TQString::fromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0;
             paper = args[9].variant().toBrush();
         }
 
@@ -235,13 +235,13 @@ TQObject* KDChartObjectFactory::createKDChartCustomBox( const TQSArgumentList& a
 
     TQColor color = TQt::black;
     if ( args.count() >= 8 ) {
-        if ( !checkIsTQtVariant( args, 8, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0;
+        if ( !checkIsTQtVariant( args, 8, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0;
         color = args[7].variant().toColor();
     }
 
     TQBrush paper = TQt::NoBrush;
     if ( args.count() >= 9 ) {
-        if ( !checkIsTQtVariant( args, 9, TQVariant::Brush, TQString::tqfromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0;
+        if ( !checkIsTQtVariant( args, 9, TQVariant::Brush, TQString::fromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0;
         paper = args[8].variant().toBrush();
     }
 
@@ -318,7 +318,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
     if ( !getNumber( args, 4,&idLineColor, "KDChartPropertySet" ) ) return 0;
 
 
-    if ( !checkIsTQtVariant( args, 5, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
+    if ( !checkIsTQtVariant( args, 5, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
     TQColor lineColor = args[4].variant().toColor();
 
     int idLineStyle;
@@ -362,7 +362,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
     int idExtraLinesColor;
     if ( !getNumber( args, 18,&idExtraLinesColor, "KDChartPropertySet" ) ) return 0;
 
-    if ( !checkIsTQtVariant( args, 19, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
+    if ( !checkIsTQtVariant( args, 19, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
     TQColor extraLinesColor = args[18].variant().toColor();
 
     int idExtraLinesStyle;
@@ -380,13 +380,13 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
     int idExtraMarkersSize;
     if ( !getNumber( args, 24,&idExtraMarkersSize, "KDChartPropertySet" ) ) return 0;
 
-    if ( !checkIsTQtVariant( args, 25, TQVariant::Size, TQString::tqfromLatin1( "TQSize" ), "KDChartPropertySet" ) ) return 0;
+    if ( !checkIsTQtVariant( args, 25, TQVariant::Size, TQString::fromLatin1( "TQSize" ), "KDChartPropertySet" ) ) return 0;
     TQSize extraMarkersSize = args[24].variant().toSize();
 
     int idExtraMarkersColor;
     if ( !getNumber( args, 26,&idExtraMarkersColor, "KDChartPropertySet" ) ) return 0;
 
-    if ( !checkIsTQtVariant( args, 27, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
+    if ( !checkIsTQtVariant( args, 27, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
     TQColor extraMarkersColor = args[26].variant().toColor();
 
     int idExtraMarkersStyle;
@@ -404,7 +404,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
     int idBarColor;
     if ( !getNumber( args, 32,&idBarColor, "KDChartPropertySet" ) ) return 0;
 
-    if ( !checkIsTQtVariant( args, 33, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
+    if ( !checkIsTQtVariant( args, 33, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0;
     TQColor barColor = args[32].variant().toColor();
 
     KDChartPropertySet* set = new KDChartPropertySet;
@@ -438,11 +438,11 @@ bool KDChartObjectFactory::isNumber( const TQVariant& v )
 bool KDChartObjectFactory::checkArgCount( const TQString& className, int count, int min, int max )
 {
     if ( count < min ) {
-        throwError( TQObject::tr( "Too few arguments when creating %1 object." ).tqarg( className ) );
+        throwError( TQObject::tr( "Too few arguments when creating %1 object." ).arg( className ) );
         return false;
     }
     if ( count > max ) {
-        throwError( TQObject::tr( "Too many arguments when creating %1 object." ).tqarg( className ) );
+        throwError( TQObject::tr( "Too many arguments when creating %1 object." ).arg( className ) );
         return false;
     }
     return true;
@@ -453,7 +453,7 @@ bool KDChartObjectFactory::checkArgsIsTQtClass( const TQSArgumentList& args, int
 {
     const TQSArgument& arg = args[index-1];
     if ( arg.type() != TQSArgument::TQObjectPtr || !arg.qobject()->inherits( expected ) ) {
-        throwError( TQObject::tr( "Invalid type for argument no %1 to %2, must be a %3" ).tqarg(index).tqarg(constructing).tqarg(expected) );
+        throwError( TQObject::tr( "Invalid type for argument no %1 to %2, must be a %3" ).arg(index).arg(constructing).arg(expected) );
         return false;
     }
     return true;
@@ -464,7 +464,7 @@ bool KDChartObjectFactory::getString( const TQSArgumentList& args, int index, TQ
 {
     const TQSArgument& arg = args[index-1];
     if ( arg.type() != TQSArgument::Variant || arg.variant().type() != TQVariant::String ) {
-        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a string" ).tqarg(index).tqarg(constructing) );
+        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a string" ).arg(index).arg(constructing) );
         return false;
     }
     else {
@@ -477,7 +477,7 @@ bool KDChartObjectFactory::getNumber( const TQSArgumentList& args, int index, do
 {
     const TQSArgument& arg = args[index-1];
     if ( arg.type() != TQSArgument::Variant || !isNumber(arg.variant()) ) {
-        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a number" ).tqarg(index).tqarg( constructing ) );
+        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a number" ).arg(index).arg( constructing ) );
         return false;
     }
     else {
@@ -508,7 +508,7 @@ bool KDChartObjectFactory::getBool( const TQSArgumentList& args, int index, bool
 {
     const TQSArgument& arg = args[index-1];
     if ( arg.type() != TQSArgument::Variant || arg.variant().type() != TQVariant::Bool ) {
-        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a boolean" ).tqarg(index).tqarg( constructing ) );
+        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a boolean" ).arg(index).arg( constructing ) );
         return false;
     }
     else {
@@ -521,7 +521,7 @@ bool KDChartObjectFactory::checkIsTQtVariant( const TQSArgumentList& args, int i
 {
     const TQSArgument& arg = args[index-1];
     if ( arg.type() != TQSArgument::Variant || arg.variant().type() != expected ) {
-        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a %3").tqarg(index).tqarg(constructing).tqarg(variantName) );
+        throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a %3").arg(index).arg(constructing).arg(variantName) );
         return false;
     }
     else
diff --git a/kchart/kdchart/KDChartPainter.cpp b/kchart/kdchart/KDChartPainter.cpp
index 156d5d82..849d2b29 100644
--- a/kchart/kdchart/KDChartPainter.cpp
+++ b/kchart/kdchart/KDChartPainter.cpp
@@ -103,7 +103,7 @@ _legendTitleWidth( 0 ),
 _legendTitleMetricsHeight( 0 )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 /**
@@ -657,7 +657,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter,
                 }
 
                 if ( rotation ) {
-		  anchor = painter->tqworldMatrix().map( anchor );
+		  anchor = painter->worldMatrix().map( anchor );
 
                     //   Temporary solution for fixing the data labels size
                     // bug when in TQPrinter::HighResolution mode:
@@ -707,7 +707,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter,
                                                         true,
                                                         true,
                                                         5 );
-                    //anchor = painter->tqworldMatrix().map( anchor );
+                    //anchor = painter->worldMatrix().map( anchor );
 
                     if( allowOverlapping ) {
                         drawThisOne = true;
@@ -850,7 +850,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter,
                         /*
 
 NOTE: The following will be REMOVED again once
-the tqlayout policy feature is implemented !!!
+the layout policy feature is implemented !!!
 
 */
                         TQRect textRect( region->pTextRegion->boundingRect() );
@@ -979,7 +979,7 @@ TQPoint KDChartPainter::calculateAnchor( const KDChartCustomBox & box,
     // Rule:
     //
     //    A box may be aligned to another box (and the 2nd box may again be
-    //    aligned to a 3rd box and so on) but NO CIRCULAR tqalignment is allowed.
+    //    aligned to a 3rd box and so on) but NO CIRCULAR alignment is allowed.
     //
     if( !box.anchorBeingCalculated() ) {
 
@@ -1650,7 +1650,7 @@ void KDChartPainter::paintHeaderFooter( TQPainter* painter,
                     params()->headerFooterFontRelSize( iHdFt ) * averageValueP1000 ) );
             painter->setPen( params()->headerFooterColor( iHdFt ) );
             painter->setFont( actFont );
-            // Note: The tqalignment flags used here match the rect calculation
+            // Note: The alignment flags used here match the rect calculation
             //       done in KDChartPainter::setupGeometry().
             //       AlignTop is done to ensure that the hd/ft texts of the same
             //       group (e.g. Hd2L and Hd2 and Hd2R) have the same baselines.
@@ -2063,7 +2063,7 @@ void KDChartPainter::calculateAllAxesRects(
 
     int nAxesBottom = TQMAX( nAxesBottom0 + nAxesBottomADD, nMinDistance );
 
-    // for micro tqalignment with the X axis, we adjust the Y axis - but not for Area Charts:
+    // for micro alignment with the X axis, we adjust the Y axis - but not for Area Charts:
     // otherwise the areas drawn would overwrite the Y axis line.
     int nAxesLeft   = TQMAX( nAxesLeft0   + nAxesLeftADD,   nMinDistance )
                       - (bIsAreaChart ? 0 : 1);
@@ -2143,10 +2143,10 @@ void KDChartPainter::calculateAllAxesRects(
 
 /**
   This method will be called whenever any parameters that affect
-  tqgeometry have been changed. It will compute the appropriate
+  geometry have been changed. It will compute the appropriate
   positions for the various parts of the chart (legend, axes, data
   area etc.). The implementation in KDChartPainter computes a
-  standard tqgeometry that should be suitable for most chart
+  standard geometry that should be suitable for most chart
   types. Subclasses can provide their own implementations.
 
   \param data the data that will be displayed as a chart
@@ -2158,7 +2158,7 @@ void KDChartPainter::setupGeometry( TQPainter* painter,
                                     const TQRect& drawRect )
 {
   //qDebug("INVOKING: KDChartPainter::setupGeometry()");
-    // avoid recursion from tqrepaint() being called due to params() changed signals...
+    // avoid recursion from repaint() being called due to params() changed signals...
     const bool oldBlockSignalsState = params()->signalsBlocked();
     const_cast < KDChartParams* > ( params() )->blockSignals( true );
 
diff --git a/kchart/kdchart/KDChartParams.cpp b/kchart/kdchart/KDChartParams.cpp
index aac8928f..e59443fb 100644
--- a/kchart/kdchart/KDChartParams.cpp
+++ b/kchart/kdchart/KDChartParams.cpp
@@ -707,7 +707,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet )
                 break;
             ++i;
         }while( properties(id, propSet) );
-        // retrieve marker tqalignment
+        // retrieve marker alignment
         propSet.deepCopy( &startSet ); i=0;
         do{
             if( propSet.hasOwnMarkerAlign( id, markerAlign ) ){
@@ -750,7 +750,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet )
 
         // extra lines:
 
-        // retrieve tqalignment of extra lines
+        // retrieve alignment of extra lines
         propSet.deepCopy( &startSet ); i=0;
         do{
             if( propSet.hasOwnExtraLinesAlign( id, extraLinesAlign ) ){
@@ -813,7 +813,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet )
 
         // markers at the ends of the extra lines:
 
-        // retrieve marker tqalignment
+        // retrieve marker alignment
         propSet.deepCopy( &startSet ); i=0;
         do{
             if( propSet.hasOwnExtraMarkersAlign( id, extraMarkersAlign ) ){
@@ -976,7 +976,7 @@ aligned to.
 This must be a reasonable combination of TQt::AlignmentFlags.
 \param negativeDeltaX The X distance between the <b>anchor
 point</b> -- specified by \c negativePosition (or \c
-        positivePosition, resp.) -- and the internal <b>tqalignment point</b>
+        positivePosition, resp.) -- and the internal <b>alignment point</b>
 of the text -- specified by \c negativeAlign (or \c positiveAlign,
         resp.). <b>Note: </b> For better compatibility to the dynamic font
 size this parameter is interpreted as being a per-cent value of the
@@ -987,7 +987,7 @@ size of the chart and the specification made via parameter \c size.
 
 \param negativeDeltaY The Y distance between the <b>anchor
 point</b> -- specified by \c negativePosition (or \c
-        positivePosition, resp.) -- and the internal <b>tqalignment point</b>
+        positivePosition, resp.) -- and the internal <b>alignment point</b>
 of the text -- specified by \c negativeAlign (or \c positiveAlign,
         resp.).  <b>Note: </b> For better compatibility to the dynamic font
 size this parameter is interpreted as being a per-cent value of the
@@ -1002,7 +1002,7 @@ special values that you might find usefull for Pie charts or for
 Ring charts: \c KDCHART_SAGGITAL_ROTATION and \c
 KDCHART_TANGENTIAL_ROTATION both leading to individual
 calculation of appropriate rotation for each data value.  Rotation
-will be performed around the internal <b>tqalignment point</b> of the
+will be performed around the internal <b>alignment point</b> of the
 text -- specified by \c negativeAlign (or \c positiveAlign, resp.).
 
 The following parameters apply to values greater than zero or equal zero:
@@ -1013,7 +1013,7 @@ aligned to.
 This must be a reasonable combination of TQt::AlignmentFlags.
 \param negativeDeltaX The X distance between the <b>anchor
 point</b> -- specified by \c negativePosition (or \c
-        positivePosition, resp.) -- and the internal <b>tqalignment point</b>
+        positivePosition, resp.) -- and the internal <b>alignment point</b>
 of the text -- specified by \c negativeAlign (or \c positiveAlign,
         resp.).  <b>Note: </b> For better compatibility to the dynamic font
 size this parameter is interpreted as being a per-cent value of the
@@ -1023,7 +1023,7 @@ delta value are calculated dynamically before painting based on the
 size of the chart and the specification made via parameter \c size.
 \param positiveDeltaY The Y distance between the <b>anchor
 point</b> -- specified by \c negativePosition (or \c
-        positivePosition, resp.) -- and the internal <b>tqalignment point</b>
+        positivePosition, resp.) -- and the internal <b>alignment point</b>
 of the text -- specified by \c negativeAlign (or \c positiveAlign,
         resp.).  <b>Note: </b> For better compatibility to the dynamic font
 size this parameter is interpreted as being a per-cent value of the
@@ -1038,7 +1038,7 @@ special values that you might find usefull for Pie charts or for
 Ring charts: \c KDCHART_SAGGITAL_ROTATION and \c
 KDCHART_TANGENTIAL_ROTATION both leading to individual
 calculation of appropriate rotation for each data value.  Rotation
-will be performed around the internal <b>tqalignment point</b> of the
+will be performed around the internal <b>alignment point</b> of the
 text -- specified by \c negativeAlign (or \c positiveAlign, resp.).
 
 \param layoutPolicy The way to handle too narrow space conflicts:
@@ -1872,10 +1872,10 @@ TQString KDChartParams::dataRegionFrameAreaName( uint dataRow,
                              uint data3rd )
 {
     return TQString( "%1/%2/%3/%4" )
-            .tqarg( KDChartEnums::AreaChartDataRegion, 5 )
-            .tqarg( dataRow, 5 )
-            .tqarg( dataCol, 5 )
-            .tqarg( data3rd, 5 );
+            .arg( KDChartEnums::AreaChartDataRegion, 5 )
+            .arg( dataRow, 5 )
+            .arg( dataCol, 5 )
+            .arg( data3rd, 5 );
 }
 
 
@@ -2609,7 +2609,7 @@ const KDChartParams::KDChartFrameSettings* KDChartParams::frameSettings( uint ar
 {
     if( pIterIdx )
         *pIterIdx = 0;
-    const TQString key( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ) );
+    const TQString key( TQString( "%1/-----/-----/-----" ).arg( area, 5 ) );
     KDChartFrameSettings* it = _areaDict.find( key );
     bFound = ( it != 0 );
     if( bFound )
@@ -2643,7 +2643,7 @@ const KDChartParams::KDChartFrameSettings* KDChartParams::frameSettings( uint ar
   */
 bool KDChartParams::removeFrame( uint area )
 {
-    return _areaDict.remove( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ) );
+    return _areaDict.remove( TQString( "%1/-----/-----/-----" ).arg( area, 5 ) );
 }
 
 
@@ -3807,9 +3807,9 @@ int KDChartParams::dataValuesRotation( uint chart, bool negative ) const
   a data text covers a neighboring data text (or a neighboring data
   area, resp.).
 
-  \note A tqlayout policy different from LayoutJustOverwrite from does
+  \note A layout policy different from LayoutJustOverwrite from does
   not mean that this policy is followed in any case. Rather than
-  giving up when the selected policy does not result in a good tqlayout
+  giving up when the selected policy does not result in a good layout
   the program will automatically try the next policy: if
   LayoutPolicyRotate did not succeed LayoutPolicyShiftVertically will
   be tried, if this did not succeed either
@@ -4617,7 +4617,7 @@ void KDChartParams::setThreeDBarAngle( uint angle )
   point. Only used if chartType() == Line and if threeDLines() ==
   false. The default is not to draw markers.
 
-  \note Use the setLineMarkerStyle function to specify the tqshape
+  \note Use the setLineMarkerStyle function to specify the shape
   of the markers, use the setLineWidth function to set the
   width of the lines connecting the markers (or to surpress
   drawing of such lines, resp.)
@@ -7487,7 +7487,7 @@ void KDChartParams::setAxisParams( uint n,
   You might want to use those sections to show some marginal information
   like department name, print date, page number... <br>
   <b>Note:</b> Those headers <b>share the same area</b> so make sure to
-  specify propper horizontal tqalignment for each section when using more than
+  specify propper horizontal alignment for each section when using more than
   one of them. By default \c HdFtPosHeader0 has centered alignement,
   \c HdFtPosHeader0L is aligned to the left and \c HdFtPosHeader0R to the
   right side. All of them are vertically aligned to the bottom, you may
@@ -7504,7 +7504,7 @@ void KDChartParams::setAxisParams( uint n,
   You could use this headers to show the main information such as project name,
   chart title or period of time (e.g. census year). <br>
   Like their counterparts they share the same part of the printable area so the
-  restrictions regarding tqalignment mentioned above apply also to these three
+  restrictions regarding alignment mentioned above apply also to these three
   sections.
 
   \li Up to three <b>additional headers</b> ( \c HdFtPosHeader2 , \c
@@ -7513,7 +7513,7 @@ void KDChartParams::setAxisParams( uint n,
   This headers could show additional information such as project phase, chart
   sub-title or sub-period of time (e.g. census quarter-year). <br>
   Like their counterparts they share the same part of the printable area so the
-  restrictions regarding tqalignment mentioned above apply also to these three
+  restrictions regarding alignment mentioned above apply also to these three
   sections.
 
   <p>
@@ -7524,7 +7524,7 @@ void KDChartParams::setAxisParams( uint n,
   You might want to use these footers instead of (or additional to) the
   main header(s) for showing the main information... <br>
   Like their header-counterparts they share the same part of the printable area
-  so the restrictions regarding tqalignment mentioned above apply also to these
+  so the restrictions regarding alignment mentioned above apply also to these
   three sections.
 
   \li Up to three <b>additional footers</b> ( \c HdFtPosFooter2 , \c
@@ -7533,7 +7533,7 @@ void KDChartParams::setAxisParams( uint n,
   This footers could show additional information instead of (or additional to)
   the additional header(s). <br>
   Like their counterparts they share the same part of the printable area so the
-  restrictions regarding tqalignment mentioned above apply also to these three
+  restrictions regarding alignment mentioned above apply also to these three
   sections.
 
   \li Up to three <b>trailing footers</b> ( \c HdFtPosFooter0 , \c
@@ -7542,7 +7542,7 @@ void KDChartParams::setAxisParams( uint n,
   You might want to use those sections to show some marginal information
   instead of (or additional to) the leading header(s). <br>
   Like their counterparts they share the same part of the printable area so the
-  restrictions regarding tqalignment mentioned above apply also to these three
+  restrictions regarding alignment mentioned above apply also to these three
   sections.
 
 \note The names \c HdFtPosHeader or \c HdFtPosFooter are the basic names also returned by \c basicAxisPos.
diff --git a/kchart/kdchart/KDChartParams.h b/kchart/kdchart/KDChartParams.h
index 16722694..2e054d81 100644
--- a/kchart/kdchart/KDChartParams.h
+++ b/kchart/kdchart/KDChartParams.h
@@ -37,7 +37,7 @@
 #include <tqdict.h>
 #include <tqintdict.h>
 #include <tqobject.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqsimplerichtext.h>
 #include <tqdom.h>
 #include <limits.h>
@@ -393,7 +393,7 @@ public slots:
                    bool           addFrameHeightToLayout = true )
         {
             _areaDict.setAutoDelete( TRUE );
-            _areaDict.replace( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ),
+            _areaDict.replace( TQString( "%1/-----/-----/-----" ).arg( area, 5 ),
                               new KDChartFrameSettings(0,0,0,
                                                        frame,
                                                        outerGapX,
@@ -436,7 +436,7 @@ public slots:
                      shadowWidth,
                            sunPos );
 
-            _areaDict.replace( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ),
+            _areaDict.replace( TQString( "%1/-----/-----/-----" ).arg( area, 5 ),
                               new KDChartFrameSettings( 0,0,0, frame,
                                                         outerGapX,
                                                         outerGapY,
diff --git a/kchart/kdchart/KDChartParams_io.cpp b/kchart/kdchart/KDChartParams_io.cpp
index 4f17e653..86f37d68 100644
--- a/kchart/kdchart/KDChartParams_io.cpp
+++ b/kchart/kdchart/KDChartParams_io.cpp
@@ -2194,12 +2194,12 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
                                 TQString str;
                                 if(areaId == KDChartEnums::AreaChartDataRegion)
                                     str = TQString( "%1/%2/%3/%4" )
-                                              .tqarg( areaId, 5 )
-                                              .tqarg( frameSettings->dataRow(), 5 )
-                                              .tqarg( frameSettings->dataCol(), 5 )
-                                              .tqarg( 0, 5 );//frameSettings->data3rd(), 5 );
+                                              .arg( areaId, 5 )
+                                              .arg( frameSettings->dataRow(), 5 )
+                                              .arg( frameSettings->dataCol(), 5 )
+                                              .arg( 0, 5 );//frameSettings->data3rd(), 5 );
                                 else
-                                    str = TQString( "%1/-----/-----/-----" ).tqarg( areaId, 5 );
+                                    str = TQString( "%1/-----/-----/-----" ).arg( areaId, 5 );
                                 _areaDict.replace( str, frameSettings );
                             }
                         }
diff --git a/kchart/kdchart/KDChartPiePainter.cpp b/kchart/kdchart/KDChartPiePainter.cpp
index ada03b44..a8e126cb 100644
--- a/kchart/kdchart/KDChartPiePainter.cpp
+++ b/kchart/kdchart/KDChartPiePainter.cpp
@@ -55,7 +55,7 @@
 KDChartPainter( params )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 
@@ -89,7 +89,7 @@ void KDChartPiePainter::paintData( TQPainter* painter,
     TQRect ourClipRect( _dataRect );
     ourClipRect.addCoords( -1,-1,1,1 );
 
-    const TQWMatrix & world = painter->tqworldMatrix();
+    const TQWMatrix & world = painter->worldMatrix();
     ourClipRect =
 #if COMPAT_TQT_VERSION >= 0x030000
         world.mapRect( ourClipRect );
diff --git a/kchart/kdchart/KDChartPolarPainter.cpp b/kchart/kdchart/KDChartPolarPainter.cpp
index 23430dbd..99cee953 100644
--- a/kchart/kdchart/KDChartPolarPainter.cpp
+++ b/kchart/kdchart/KDChartPolarPainter.cpp
@@ -50,7 +50,7 @@ KDChartPolarPainter::KDChartPolarPainter( KDChartParams* params ) :
     KDChartPainter( params )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 
@@ -89,7 +89,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter,
     // PENDING(khz) adjust the clip rect if neccessary...
     //
 
-    const TQWMatrix & world = painter->tqworldMatrix();
+    const TQWMatrix & world = painter->worldMatrix();
     ourClipRect =
 #if COMPAT_TQT_VERSION >= 0x030000
         world.mapRect( ourClipRect );
@@ -515,7 +515,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter,
             pt2 = center + polarToXY( r2, currentAngle );
             pt3 = center + polarToXY( r3, currentAngle );
 
-            //pt3 = painter->tqworldMatrix().map( pt3 );
+            //pt3 = painter->worldMatrix().map( pt3 );
 
             if( paraSagittal.axisShowGrid() ) {
                 painter->setPen( TQPen( paraSagittal.axisGridColor(),
@@ -538,7 +538,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter,
 
                 KDDrawText::drawRotatedText( painter,
                         currentAngle+90,
-                        painter->tqworldMatrix().map(pt3),
+                        painter->worldMatrix().map(pt3),
                         label,
                         0,
                         TQt::AlignCenter );
@@ -673,7 +673,7 @@ void KDChartPolarPainter::paintCircularAxisLabel( TQPainter* painter,
     KDDrawText::drawRotatedText(
             painter,
             rotate ? txtAngle - 90 : 0,
-            painter->tqworldMatrix().map(center - polarToXY( static_cast<int>( currentRadiusPPU ), txtAngle )),
+            painter->worldMatrix().map(center - polarToXY( static_cast<int>( currentRadiusPPU ), txtAngle )),
             txt,
             0,
             step
diff --git a/kchart/kdchart/KDChartPropertySet.h b/kchart/kdchart/KDChartPropertySet.h
index cdd64f78..bc618143 100644
--- a/kchart/kdchart/KDChartPropertySet.h
+++ b/kchart/kdchart/KDChartPropertySet.h
@@ -34,7 +34,7 @@
 #include <kdchart_export.h>
 #include <tqdom.h>
 #include <tqcolor.h>
-#include <tqbrush.h>
+#include <brush.h>
 
 /**
   \file KDChartPropertySet.h
@@ -721,14 +721,14 @@ public slots:
     }
 
     /**
-      Specify the ID of the property set specifying the tqalignment of the
+      Specify the ID of the property set specifying the alignment of the
       Marker to be displayed for this data value
       <b>or</b> specifying this flag directly.
 
       \note This function should be used for Line Charts only, otherwise
       the settings specified here will be ignored.
 
-      \param idMarkerAlign ID of the property set specifying the tqalignment
+      \param idMarkerAlign ID of the property set specifying the alignment
       of the Marker to be shown.
       Use special value KDChartPropertySet::UndefinedID
       to specify neither another property set's ID
@@ -737,7 +737,7 @@ public slots:
       if you do NOT want to inherit another property set's
       settings but want to specify the flag by using
       the following parameter.
-      \param markerAlign  The tqalignment of the marker to be shown.
+      \param markerAlign  The alignment of the marker to be shown.
       This parameter is stored but ignored if the previous parameter
       is not set to KDChartPropertySet::OwnID.
 
diff --git a/kchart/kdchart/KDChartRingPainter.cpp b/kchart/kdchart/KDChartRingPainter.cpp
index 9740fa5e..ba1e6fed 100644
--- a/kchart/kdchart/KDChartRingPainter.cpp
+++ b/kchart/kdchart/KDChartRingPainter.cpp
@@ -53,7 +53,7 @@
 KDChartPainter( params )
 {
     // This constructor intentionally left blank so far; we cannot setup the
-    // tqgeometry yet since we do not know the size of the painter.
+    // geometry yet since we do not know the size of the painter.
 }
 
 
@@ -84,7 +84,7 @@ void KDChartRingPainter::paintData( TQPainter* painter,
 
     TQRect ourClipRect( _dataRect );
 
-    const TQWMatrix & world = painter->tqworldMatrix();
+    const TQWMatrix & world = painter->worldMatrix();
     ourClipRect =
 #if COMPAT_TQT_VERSION >= 0x030000
         world.mapRect( ourClipRect );
diff --git a/kchart/kdchart/KDChartTableBase.cpp b/kchart/kdchart/KDChartTableBase.cpp
index 1ebfa9fd..fcec2c53 100644
--- a/kchart/kdchart/KDChartTableBase.cpp
+++ b/kchart/kdchart/KDChartTableBase.cpp
@@ -74,7 +74,7 @@
    future absicssa axis value:
    \verbatim
 
-   const TQDateTime currentTime( TQDateTime::tqcurrentDateTime() );
+   const TQDateTime currentTime( TQDateTime::currentDateTime() );
    for( int iCell = 0;  iCell < usedValues;  ++iCell ){
    KDChartData& cell = myData.cell( 0, iCell );
    // assign special property set ID if X value is in the future
diff --git a/kchart/kdchart/KDChartTextPiece.cpp b/kchart/kdchart/KDChartTextPiece.cpp
index b95165f7..e986c853 100644
--- a/kchart/kdchart/KDChartTextPiece.cpp
+++ b/kchart/kdchart/KDChartTextPiece.cpp
@@ -28,7 +28,7 @@
  **********************************************************************/
 #include "KDChartTextPiece.h"
 
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqsimplerichtext.h>
 #include <tqfontmetrics.h>
 #include <tqpainter.h>
diff --git a/kchart/kdchart/KDChartTextPiece.h b/kchart/kdchart/KDChartTextPiece.h
index adb176b2..ab1916b0 100644
--- a/kchart/kdchart/KDChartTextPiece.h
+++ b/kchart/kdchart/KDChartTextPiece.h
@@ -32,7 +32,7 @@
 #include <tqstring.h>
 #include <tqfont.h>
 #include <tqregion.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqobject.h>
 #include <kdchart_export.h>
 
diff --git a/kchart/kdchart/KDChartWidget.cpp b/kchart/kdchart/KDChartWidget.cpp
index d530ea19..8217abfc 100644
--- a/kchart/kdchart/KDChartWidget.cpp
+++ b/kchart/kdchart/KDChartWidget.cpp
@@ -244,8 +244,8 @@ void KDChartWidget::resizeEvent( TQResizeEvent* /*event*/ )
   display process, so this is turned off by default.
 
   If active data reporting is turned on when the widget is already
-  shown, data will be reported after the next tqrepaint(). Call
-  tqrepaint() explicitly if necessary.
+  shown, data will be reported after the next repaint(). Call
+  repaint() explicitly if necessary.
 
   Active data is currently supported for bar, pie, and line charts
   (the latter only with markers, as trying to hit the line would be
@@ -281,7 +281,7 @@ bool KDChartWidget::isActiveData() const
   needs to be kept around. However, in most cases, it is worth
   spending the extra memory. Double-buffering is on by
   default. Turning double-buffering on or off does not trigger a
-  tqrepaint.
+  repaint.
 
   \param doublebuffered if true, turns double-buffering on, if false,
   turns double-buffering off
diff --git a/kchart/kdchart/KDChartWrapperFactory.cpp b/kchart/kdchart/KDChartWrapperFactory.cpp
index 2ff08f1a..b42c0379 100644
--- a/kchart/kdchart/KDChartWrapperFactory.cpp
+++ b/kchart/kdchart/KDChartWrapperFactory.cpp
@@ -17,16 +17,16 @@ KDChartWrapperFactory::KDChartWrapperFactory()
 
 TQObject* KDChartWrapperFactory::create( const TQString& className, void* ptr )
 {
-    if ( className == TQString::tqfromLatin1( "KDChartParams" ) )
+    if ( className == TQString::fromLatin1( "KDChartParams" ) )
         return new KDChartParamsWrapper( static_cast<KDChartParams*>( ptr ) );
 
-    if ( className == TQString::tqfromLatin1( "KDChartVectorTableData" ) )
+    if ( className == TQString::fromLatin1( "KDChartVectorTableData" ) )
         return new KDChartTableDataWrapper( static_cast<KDChartTableData*>( ptr ) );
 
-    if ( className == TQString::tqfromLatin1( "KDChartCustomBox" ) )
+    if ( className == TQString::fromLatin1( "KDChartCustomBox" ) )
         return new KDChartCustomBoxWrapper( static_cast<KDChartCustomBox*>( ptr ) );
 
-    if ( className == TQString::tqfromLatin1( "KDChartAxisParams" ) )
+    if ( className == TQString::fromLatin1( "KDChartAxisParams" ) )
         return new KDChartAxisParamsWrapper( static_cast<KDChartAxisParams*>( ptr ) );
 
     return 0;
diff --git a/kchart/kdchart/KDDrawText.cpp b/kchart/kdchart/KDDrawText.cpp
index 70283da6..c0985134 100644
--- a/kchart/kdchart/KDDrawText.cpp
+++ b/kchart/kdchart/KDDrawText.cpp
@@ -408,7 +408,7 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter,
             painter->drawLine( x+pBotRight.x(),     y+pBotRight.y()-3, x+pBotRight.x(),     y+pBotRight.y()+3 );
             */
 
-            // The horizontal and vertical tqalignment together define one of
+            // The horizontal and vertical alignment together define one of
             // NINE possible points: this point must be moved on the anchor.
             int hAlign = align & ( TQt::AlignLeft | TQt::AlignRight  | TQt::AlignHCenter );
             int vAlign = align & ( TQt::AlignTop  | TQt::AlignBottom | TQt::AlignVCenter );
diff --git a/kchart/kdchart/KDDrawText.h b/kchart/kdchart/KDDrawText.h
index 5fb9dbfd..7842e9b5 100644
--- a/kchart/kdchart/KDDrawText.h
+++ b/kchart/kdchart/KDDrawText.h
@@ -53,7 +53,7 @@ class KDDrawText
                 const TQString& text,
                 const TQFont* font = 0,
                 int align = TQt::AlignLeft | TQt::AlignTop,
-                // useful for debugging of your tqlayout:
+                // useful for debugging of your layout:
                 bool showAnchor    = false,
                 const TQFontMetrics* fontMet = 0,
                 bool noFirstrotate = false,
@@ -81,7 +81,7 @@ class KDDrawText
                 const TQString& text,
                 const TQFont* font  = 0,
                 int align = TQt::AlignLeft | TQt::AlignTop,
-                // usefull for debugging of your tqlayout:
+                // usefull for debugging of your layout:
                 bool showAnchor    = false,
                 // speed-up parameters
                 // used internally by drawCircleText()
diff --git a/kchart/kdchart/KDFrame.cpp b/kchart/kdchart/KDFrame.cpp
index 3904bf16..c760032f 100644
--- a/kchart/kdchart/KDFrame.cpp
+++ b/kchart/kdchart/KDFrame.cpp
@@ -28,7 +28,7 @@
 **********************************************************************/
 
 #include <tqpainter.h>
-#include <tqbrush.h>
+#include <brush.h>
 
 #include <KDFrame.h>
 #include <KDFrameProfileSection.h>
diff --git a/kchart/kdchart/KDFrame.h b/kchart/kdchart/KDFrame.h
index 78de8ffb..e3bd6a1d 100644
--- a/kchart/kdchart/KDFrame.h
+++ b/kchart/kdchart/KDFrame.h
@@ -36,7 +36,7 @@
 #include <tqpen.h>
 #include <tqmap.h>
 #include <tqobject.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqdom.h>
 
 #include <KDFrameProfileSection.h>
diff --git a/kchart/kdchart/KDFrameProfileSection.h b/kchart/kdchart/KDFrameProfileSection.h
index 9fe38adf..48f70bb3 100644
--- a/kchart/kdchart/KDFrameProfileSection.h
+++ b/kchart/kdchart/KDFrameProfileSection.h
@@ -104,7 +104,7 @@ public:
 
 
     /**
-    Profile Curvature Mode: specifying the tqshape of a frame profile section.
+    Profile Curvature Mode: specifying the shape of a frame profile section.
     (curvature setting will be ignored for \c DirPlain profiles)
 
     \li \c CvtFlat looking like a evenly sloping surface.
diff --git a/kchart/kdchart/KDXMLTools.h b/kchart/kdchart/KDXMLTools.h
index 4ebe6872..b68f5211 100644
--- a/kchart/kdchart/KDXMLTools.h
+++ b/kchart/kdchart/KDXMLTools.h
@@ -36,7 +36,7 @@
 #include <tqdom.h>
 #include <tqstring.h>
 #include <tqcolor.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqsize.h>
 #include <tqrect.h>
 #include <tqfont.h>