Rename a number of classes to enhance compatibility with KDE4

10 files changed, 74 insertions, 74 deletions

diff --git a/kchart/ChangeLog b/kchart/ChangeLog
index 542c9a27..5d38df2f 100644
--- a/kchart/ChangeLog
+++ b/kchart/ChangeLog
@@ -208,7 +208,7 @@
 
 	Disable "Import Data" if inside KSpread
 	* kchart_view.{h,cc} (m_importData): New member
-	(KChartView): Disable the KAction if data is unchangeable.
+	(KChartView): Disable the TDEAction if data is unchangeable.
 
 2005-04-10  Inge Wallin  <inge@lysator.liu.se>
 
@@ -224,7 +224,7 @@
 	* csvimportdialogui.ui: new file
 	* Makefile.am: Add files above
 	* kchart.rc (File menu): Add Action import_data
-	* kchart_view.cc (import_data): new KAction
+	* kchart_view.cc (import_data): new TDEAction
 	(importData): new slot
 	
 
diff --git a/kchart/kchartColorConfigPage.cc b/kchart/kchartColorConfigPage.cc
index 30f1b275..c4b2cbc1 100644
--- a/kchart/kchartColorConfigPage.cc
+++ b/kchart/kchartColorConfigPage.cc
@@ -129,7 +129,7 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params,
 
     TQHBox* dataColorHB = new TQHBox( gb );
     grid->addMultiCellWidget( dataColorHB,  0, row, 2, 2 );
-    _dataColorLB = new KListBox(dataColorHB);
+    _dataColorLB = new TDEListBox(dataColorHB);
     _dataColorCB = new KColorButton( dataColorHB);
     wtstr = i18n( "Choose a row/column in the list on the left and change its color using this button.");
     TQWhatsThis::add( _dataColorCB, wtstr );
diff --git a/kchart/kchartColorConfigPage.h b/kchart/kchartColorConfigPage.h
index 21dfd969..cbafcdea 100644
--- a/kchart/kchartColorConfigPage.h
+++ b/kchart/kchartColorConfigPage.h
@@ -27,7 +27,7 @@
 #include "koChart.h"
 #include "kchartcolorarray.h"
 
-class KListBox;
+class TDEListBox;
 
 
 namespace KChart
@@ -118,7 +118,7 @@ private:
 
 //  KColorButton* _edgeCB;
 //  KColorButton* _dataCB[NUMDATACOLORS];
-    KListBox* _dataColorLB;
+    TDEListBox* _dataColorLB;
     KColorButton* _dataColorCB;
     KChartColorArray extColor;
     uint index;
diff --git a/kchart/kchartFontConfigPage.cc b/kchart/kchartFontConfigPage.cc
index d2a444b9..e5fdde2f 100644
--- a/kchart/kchartFontConfigPage.cc
+++ b/kchart/kchartFontConfigPage.cc
@@ -102,7 +102,7 @@ KChartFontConfigPage::KChartFontConfigPage( KChartParams* params,
 
 #if 0
     // FIXME: Integrate the font chooser instead?  Well, maybe later.
-    KFontChooser  *fontChooser = new KFontChooser(this, "fontChooser");
+    TDEFontChooser  *fontChooser = new TDEFontChooser(this, "fontChooser");
     grid->addMultiCellWidget(fontChooser, 0, 2, 1, 1);
 #endif
 
@@ -170,18 +170,18 @@ void KChartFontConfigPage::changeLabelFont()
             = (xAxisIsRelative == yAxisIsRelative)
             ? (xAxisIsRelative ? TQButton::On : TQButton::Off)
             : TQButton::NoChange;
-        if (KFontDialog::getFontDiff( newFont,
+        if (TDEFontDialog::getFontDiff( newFont,
                                       flags,
                                       false,
                                       this,
                                       true,
                                       &newState ) != TQDialog::Rejected) {
-            if ( KFontChooser::FamilyList & flags ) {
+            if ( TDEFontChooser::FamilyList & flags ) {
                 xAxis.setFamily( newFont.family() );
                 yAxis.setFamily( newFont.family() );
             }
 
-            if ( KFontChooser::StyleList & flags ) {
+            if ( TDEFontChooser::StyleList & flags ) {
                 xAxis.setWeight( newFont.weight() );
                 xAxis.setItalic( newFont.italic() );
                 xAxis.setUnderline( newFont.underline() );
@@ -193,13 +193,13 @@ void KChartFontConfigPage::changeLabelFont()
                 yAxis.setStrikeOut( newFont.strikeOut() );
             }
 
-            if ( KFontChooser::SizeList & flags ) {
+            if ( TDEFontChooser::SizeList & flags ) {
                 xAxis.setPointSize( newFont.pointSize() );
                 yAxis.setPointSize( newFont.pointSize() );
             }
 
             // CharSet settings are ignored since we are not TQt 2.x compatible
-            // if( KFontChooser::CharsetList & flags ) {
+            // if( TDEFontChooser::CharsetList & flags ) {
             // }
 
             if ( TQButton::NoChange != newState ) {
@@ -211,7 +211,7 @@ void KChartFontConfigPage::changeLabelFont()
     else if ( font && state ) {
         TQFont newFont( *font );
         TQButton::ToggleState newState = *state;
-        if (KFontDialog::getFont( newFont,
+        if (TDEFontDialog::getFont( newFont,
                                   false,
                                   this,
                                   true,
diff --git a/kchart/kchartHeaderFooterConfigPage.cc b/kchart/kchartHeaderFooterConfigPage.cc
index e6c6c99b..36412a45 100644
--- a/kchart/kchartHeaderFooterConfigPage.cc
+++ b/kchart/kchartHeaderFooterConfigPage.cc
@@ -158,7 +158,7 @@ void KChartHeaderFooterConfigPage::apply()
 void KChartHeaderFooterConfigPage::changeTitleFont()
 {
     TQButton::ToggleState state = titleFontIsRelative;
-    if (    KFontDialog::getFont( titleFont,false,this, true,&state ) != TQDialog::Rejected
+    if (    TDEFontDialog::getFont( titleFont,false,this, true,&state ) != TQDialog::Rejected
             && TQButton::NoChange != state )
         titleFontIsRelative = state;
 }
@@ -166,7 +166,7 @@ void KChartHeaderFooterConfigPage::changeTitleFont()
 void KChartHeaderFooterConfigPage::changeSubtitleFont()
 {
     TQButton::ToggleState state = subtitleFontIsRelative;
-    if (    KFontDialog::getFont( subtitleFont,false,this, true,&state ) != TQDialog::Rejected
+    if (    TDEFontDialog::getFont( subtitleFont,false,this, true,&state ) != TQDialog::Rejected
             && TQButton::NoChange != state )
         subtitleFontIsRelative = state;
 }
@@ -174,7 +174,7 @@ void KChartHeaderFooterConfigPage::changeSubtitleFont()
 void KChartHeaderFooterConfigPage::changeFooterFont()
 {
     TQButton::ToggleState state = footerFontIsRelative;
-    if (    KFontDialog::getFont( footerFont,false,this, true,&state ) != TQDialog::Rejected
+    if (    TDEFontDialog::getFont( footerFont,false,this, true,&state ) != TQDialog::Rejected
             && TQButton::NoChange != state )
         footerFontIsRelative = state;
 }
diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc
index 58d9acf2..154ce2a7 100644
--- a/kchart/kchartLegendConfigPage.cc
+++ b/kchart/kchartLegendConfigPage.cc
@@ -282,7 +282,7 @@ void KChartLegendConfigPage::init()
 void KChartLegendConfigPage::changeTitleLegendFont()
 {
     TQButton::ToggleState state = titleLegendIsRelative;
-    if (    KFontDialog::getFont( titleLegend,false,this, true,&state ) != TQDialog::Rejected
+    if (    TDEFontDialog::getFont( titleLegend,false,this, true,&state ) != TQDialog::Rejected
          && TQButton::NoChange != state )
         titleLegendIsRelative = state;
 }
@@ -290,7 +290,7 @@ void KChartLegendConfigPage::changeTitleLegendFont()
 void KChartLegendConfigPage::changeTextLegendFont()
 {
     TQButton::ToggleState state = textLegendIsRelative;
-    if (    KFontDialog::getFont( textLegend,false,this, true,&state ) != TQDialog::Rejected
+    if (    TDEFontDialog::getFont( textLegend,false,this, true,&state ) != TQDialog::Rejected
          && TQButton::NoChange != state )
         textLegendIsRelative = state;
 }
diff --git a/kchart/kchartWizardLabelsLegendPage.cc b/kchart/kchartWizardLabelsLegendPage.cc
index 396264d8..9ac1a265 100644
--- a/kchart/kchartWizardLabelsLegendPage.cc
+++ b/kchart/kchartWizardLabelsLegendPage.cc
@@ -204,39 +204,39 @@ KChartWizardLabelsLegendPage::~KChartWizardLabelsLegendPage()
 
 void KChartWizardLabelsLegendPage::changeLegendTextFont()
 {
-    if (KFontDialog::getFont( _legendTextFont,false,this ) == TQDialog::Rejected )
+    if (TDEFontDialog::getFont( _legendTextFont,false,this ) == TQDialog::Rejected )
         return;
 }
 
 void KChartWizardLabelsLegendPage::changeLegendTitleFont()
 {
-    if (KFontDialog::getFont( _legendTitleFont,false,this ) == TQDialog::Rejected )
+    if (TDEFontDialog::getFont( _legendTitleFont,false,this ) == TQDialog::Rejected )
         return;
 }
 
 void KChartWizardLabelsLegendPage::changeXLabelFont()
 {
-    if (KFontDialog::getFont( xlabel,false,this ) == TQDialog::Rejected )
+    if (TDEFontDialog::getFont( xlabel,false,this ) == TQDialog::Rejected )
         return;
 }
 
 void KChartWizardLabelsLegendPage::changeYLabelFont()
 {
-    if (KFontDialog::getFont( ylabel ,false,this ) == TQDialog::Rejected )
+    if (TDEFontDialog::getFont( ylabel ,false,this ) == TQDialog::Rejected )
         return;
 }
 
 #if 0
 void KChartWizardLabelsLegendPage::changeY2LabelFont()
 {
-    if (KFontDialog::getFont( ylabel2, false, this ) == TQDialog::Rejected )
+    if (TDEFontDialog::getFont( ylabel2, false, this ) == TQDialog::Rejected )
         return;
 }
 #endif
 
 void KChartWizardLabelsLegendPage::changeTitleFont()
 {
-    if (KFontDialog::getFont( title ,false,this ) == TQDialog::Rejected )
+    if (TDEFontDialog::getFont( title ,false,this ) == TQDialog::Rejected )
         return;
 
 }
diff --git a/kchart/kchartWizardSetupAxesPage.cc b/kchart/kchartWizardSetupAxesPage.cc
index 76be1f0d..cf0e4a09 100644
--- a/kchart/kchartWizardSetupAxesPage.cc
+++ b/kchart/kchartWizardSetupAxesPage.cc
@@ -223,7 +223,7 @@ void KChartWizardSetupAxesPage::changeGridColor(const TQColor &_color)
 
 void KChartWizardSetupAxesPage::changeLabelFont()
 {
-    if( KFontDialog::getFont( ylabel,false,this ) == TQDialog::Rejected )
+    if( TDEFontDialog::getFont( ylabel,false,this ) == TQDialog::Rejected )
         return;
 }
 
diff --git a/kchart/kchart_view.cc b/kchart/kchart_view.cc
index 00606e81..62fd3825 100644
--- a/kchart/kchart_view.cc
+++ b/kchart/kchart_view.cc
@@ -64,100 +64,100 @@ KChartView::KChartView( KChartPart* part, TQWidget* parent, const char* name )
     m_dcop = 0;
     dcopObject(); // build it
 
-    m_importData = new KAction( i18n( "Import Data..." ), 0,
+    m_importData = new TDEAction( i18n( "Import Data..." ), 0,
 				TQT_TQOBJECT(this), TQT_SLOT( importData() ),
 				actionCollection(), "import_data" );
 #if 0
-    KAction * actionExtraCreateTemplate	=
+    TDEAction * actionExtraCreateTemplate	=
 #endif
-	new KAction( i18n( "&Create Template From Document..." ), 0,
+	new TDEAction( i18n( "&Create Template From Document..." ), 0,
 		       TQT_TQOBJECT(this), TQT_SLOT( extraCreateTemplate() ),
 		       actionCollection(), "extra_template" );
 
-    m_wizard = new KAction( i18n("Customize with &Wizard..."),
+    m_wizard = new TDEAction( i18n("Customize with &Wizard..."),
                             "wizard", 0,
                             TQT_TQOBJECT(this), TQT_SLOT( wizard() ),
                             actionCollection(), "wizard");
-    m_edit = new KAction( i18n("Edit &Data..."), "edit", 0,
+    m_edit = new TDEAction( i18n("Edit &Data..."), "edit", 0,
                           TQT_TQOBJECT(this), TQT_SLOT( editData() ),
                           actionCollection(), "editdata");
-    m_config = new KAction( i18n( "&Chart..." ), "configure", 0,
+    m_config = new TDEAction( i18n( "&Chart..." ), "configure", 0,
 
                             TQT_TQOBJECT(this), TQT_SLOT( slotConfig() ),
                             actionCollection(), "config" );
 
-    // One KToggleAction per chart type
-    m_chartbars = new KToggleAction( i18n("&Bar"), "chart_bar_3d", 0, TQT_TQOBJECT(this),
+    // One TDEToggleAction per chart type
+    m_chartbars = new TDEToggleAction( i18n("&Bar"), "chart_bar_3d", 0, TQT_TQOBJECT(this),
                                      TQT_SLOT( barsChart() ), actionCollection(),
                                      "barschart");
     m_chartbars->setExclusiveGroup( "charttypes" );
     m_chartbars->setChecked( true );
 
-    m_chartline = new KToggleAction( i18n("&Line"), "chart_line", 0, TQT_TQOBJECT(this),
+    m_chartline = new TDEToggleAction( i18n("&Line"), "chart_line", 0, TQT_TQOBJECT(this),
                                      TQT_SLOT( lineChart() ), actionCollection(),
                                      "linechart");
     m_chartline->setExclusiveGroup( "charttypes" );
 
-    m_chartareas = new KToggleAction( i18n("&Area"), "chart_area", 0, TQT_TQOBJECT(this),
+    m_chartareas = new TDEToggleAction( i18n("&Area"), "chart_area", 0, TQT_TQOBJECT(this),
                                       TQT_SLOT( areasChart() ), actionCollection(),
                                       "areaschart");
     m_chartareas->setExclusiveGroup( "charttypes" );
 
-    m_charthilo = new KToggleAction( i18n("&HiLo"), "chart_hilo", 0, TQT_TQOBJECT(this),
+    m_charthilo = new TDEToggleAction( i18n("&HiLo"), "chart_hilo", 0, TQT_TQOBJECT(this),
                                      TQT_SLOT( hiLoChart() ), actionCollection(),
                                      "hilochart");
     m_charthilo->setExclusiveGroup( "charttypes" );
 
-    m_chartbw = new KToggleAction( i18n("Bo&x && Whiskers"), "chart_boxwhisker", 0, TQT_TQOBJECT(this),
+    m_chartbw = new TDEToggleAction( i18n("Bo&x && Whiskers"), "chart_boxwhisker", 0, TQT_TQOBJECT(this),
                                      TQT_SLOT( bwChart() ), actionCollection(),
                                      "bwchart");
     m_chartbw->setExclusiveGroup( "charttypes" );
 
-    m_chartpie = new KToggleAction( i18n("&Pie"), "chart_pie", 0, TQT_TQOBJECT(this),
+    m_chartpie = new TDEToggleAction( i18n("&Pie"), "chart_pie", 0, TQT_TQOBJECT(this),
                                     TQT_SLOT( pieChart() ), actionCollection(),
                                     "piechart");
     m_chartpie->setExclusiveGroup( "charttypes" );
 
-    m_chartring = new KToggleAction( i18n("&Ring"), "chart_ring", 0, TQT_TQOBJECT(this),
+    m_chartring = new TDEToggleAction( i18n("&Ring"), "chart_ring", 0, TQT_TQOBJECT(this),
                                      TQT_SLOT( ringChart() ), actionCollection(),
                                      "ringchart");
     m_chartring->setExclusiveGroup( "charttypes" );
 
-    m_chartpolar = new KToggleAction( i18n("&Polar"), "chart_polar", 0, TQT_TQOBJECT(this),
+    m_chartpolar = new TDEToggleAction( i18n("&Polar"), "chart_polar", 0, TQT_TQOBJECT(this),
                                      TQT_SLOT( polarChart() ), actionCollection(),
                                      "polarchart");
     m_chartpolar->setExclusiveGroup( "charttypes" );
 
-    // Configuration KActions
-    m_colorConfig = new KAction( i18n( "&Colors..." ), 0,
+    // Configuration TDEActions
+    m_colorConfig = new TDEAction( i18n( "&Colors..." ), 0,
                             TQT_TQOBJECT(this), TQT_SLOT( slotConfigColor() ),
                             actionCollection(), "color_config" );
 
-    m_fontConfig = new KAction( i18n( "&Font..." ), 0,
+    m_fontConfig = new TDEAction( i18n( "&Font..." ), 0,
                             TQT_TQOBJECT(this), TQT_SLOT( slotConfigFont() ),
                             actionCollection(), "font_config" );
 
-    m_backConfig = new KAction( i18n( "&Background..." ), 0,
+    m_backConfig = new TDEAction( i18n( "&Background..." ), 0,
                             TQT_TQOBJECT(this), TQT_SLOT( slotConfigBack() ),
                             actionCollection(), "back_config" );
 
-    m_legendConfig = new KAction( i18n( "&Legend..." ), 0,
+    m_legendConfig = new TDEAction( i18n( "&Legend..." ), 0,
                             TQT_TQOBJECT(this), TQT_SLOT( slotConfigLegend() ),
                             actionCollection(), "legend_config" );
 
-    m_subTypeChartConfig = new KAction( i18n( "Chart &Sub-type..." ), 0,
+    m_subTypeChartConfig = new TDEAction( i18n( "Chart &Sub-type..." ), 0,
                             TQT_TQOBJECT(this), TQT_SLOT( slotConfigSubTypeChart() ),
                             actionCollection(), "legend_subtype" );
 
-    m_dataFormatConfig = new KAction( i18n( "&Data Format..." ), 0,
+    m_dataFormatConfig = new TDEAction( i18n( "&Data Format..." ), 0,
                             TQT_TQOBJECT(this), TQT_SLOT( slotConfigDataFormat() ),
                             actionCollection(), "data_format" );
 
-    m_headerFooterConfig = new KAction( i18n( "&Header && Footer..." ), 0,
+    m_headerFooterConfig = new TDEAction( i18n( "&Header && Footer..." ), 0,
                             TQT_TQOBJECT(this), TQT_SLOT( slotConfigHeaderFooterChart() ),
                             actionCollection(), "headerfooter_subtype" );
 
-    m_pageLayoutConfig = new KAction( i18n( "Page Layout..." ), 0,
+    m_pageLayoutConfig = new TDEAction( i18n( "Page Layout..." ), 0,
                             TQT_TQOBJECT(this), TQT_SLOT( slotConfigPageLayout() ),
                             actionCollection(), "page_layout" );
 
diff --git a/kchart/kchart_view.h b/kchart/kchart_view.h
index dc41acf6..c8d5784e 100644
--- a/kchart/kchart_view.h
+++ b/kchart/kchart_view.h
@@ -10,8 +10,8 @@
 #include <KoView.h>
 #include "kdchart/KDChartAxisParams.h"
 
-class KAction;
-class KToggleAction;
+class TDEAction;
+class TDEToggleAction;
 class TQPaintEvent;
 
 class DCOPObject;
@@ -77,30 +77,30 @@ protected:
     void          updateButton();
 
 private:
-    KAction  *m_importData;
-    KAction  *m_wizard;
-    KAction  *m_edit;
-    KAction  *m_config;
-    KAction  *m_saveconfig;
-    KAction  *m_loadconfig;
-    KAction  *m_defaultconfig;
-    KAction  *m_colorConfig;
-    KAction  *m_fontConfig;
-    KAction  *m_backConfig;
-    KAction  *m_legendConfig;
-    KAction  *m_dataFormatConfig;
-    KAction  *m_subTypeChartConfig;
-    KAction  *m_headerFooterConfig;
-    KAction  *m_pageLayoutConfig;
-
-    KToggleAction  *m_chartpie;
-    KToggleAction  *m_chartareas;
-    KToggleAction  *m_chartbars;
-    KToggleAction  *m_chartline;
-    KToggleAction  *m_charthilo;
-    KToggleAction  *m_chartring;
-    KToggleAction  *m_chartpolar;
-    KToggleAction  *m_chartbw;
+    TDEAction  *m_importData;
+    TDEAction  *m_wizard;
+    TDEAction  *m_edit;
+    TDEAction  *m_config;
+    TDEAction  *m_saveconfig;
+    TDEAction  *m_loadconfig;
+    TDEAction  *m_defaultconfig;
+    TDEAction  *m_colorConfig;
+    TDEAction  *m_fontConfig;
+    TDEAction  *m_backConfig;
+    TDEAction  *m_legendConfig;
+    TDEAction  *m_dataFormatConfig;
+    TDEAction  *m_subTypeChartConfig;
+    TDEAction  *m_headerFooterConfig;
+    TDEAction  *m_pageLayoutConfig;
+
+    TDEToggleAction  *m_chartpie;
+    TDEToggleAction  *m_chartareas;
+    TDEToggleAction  *m_chartbars;
+    TDEToggleAction  *m_chartline;
+    TDEToggleAction  *m_charthilo;
+    TDEToggleAction  *m_chartring;
+    TDEToggleAction  *m_chartpolar;
+    TDEToggleAction  *m_chartbw;
 
     DCOPObject  *m_dcop;