diff options
Diffstat (limited to 'kchart')
| -rw-r--r-- | kchart/csvimportdialog.cpp | 36 | ||||
| -rw-r--r-- | kchart/kchartBackgroundPixmapConfigPage.cpp | 6 | ||||
| -rw-r--r-- | kchart/kchartColorConfigPage.cpp | 4 | ||||
| -rw-r--r-- | kchart/kchartConfigDialog.cpp | 4 | ||||
| -rw-r--r-- | kchart/kchartDataEditor.cpp | 40 | ||||
| -rw-r--r-- | kchart/kchartFontConfigPage.cpp | 8 | ||||
| -rw-r--r-- | kchart/kchartHeaderFooterConfigPage.cpp | 6 | ||||
| -rw-r--r-- | kchart/kchartLegendConfigPage.cpp | 8 | ||||
| -rw-r--r-- | kchart/kchartLine3dConfigPage.cpp | 4 | ||||
| -rw-r--r-- | kchart/kchartPageLayout.cpp | 6 | ||||
| -rw-r--r-- | kchart/kchartParameter3dConfigPage.cpp | 4 | ||||
| -rw-r--r-- | kchart/kchartParameterConfigPage.cpp | 16 | ||||
| -rw-r--r-- | kchart/kchartParameterPieConfigPage.cpp | 2 | ||||
| -rw-r--r-- | kchart/kchartPieConfigPage.cpp | 4 | ||||
| -rw-r--r-- | kchart/kchartSubTypeChartPage.cpp | 20 | ||||
| -rw-r--r-- | kchart/kchartWizard.cpp | 18 | ||||
| -rw-r--r-- | kchart/kchartWizardLabelsLegendPage.cpp | 36 | ||||
| -rw-r--r-- | kchart/kchartWizardSelectChartTypePage.cpp | 4 | ||||
| -rw-r--r-- | kchart/kchartWizardSetupAxesPage.cpp | 14 | ||||
| -rw-r--r-- | kchart/kchartWizardSetupDataPage.cpp | 16 | ||||
| -rw-r--r-- | kchart/kchart_part.cpp | 2 | ||||
| -rw-r--r-- | kchart/kchart_view.cpp | 54 |
22 files changed, 156 insertions, 156 deletions
diff --git a/kchart/csvimportdialog.cpp b/kchart/csvimportdialog.cpp index cf13c1b5..a728a318 100644 --- a/kchart/csvimportdialog.cpp +++ b/kchart/csvimportdialog.cpp @@ -88,24 +88,24 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray) m_dialog->m_sheet->setSelectionMode( TQTable::Multi ); - connect(m_dialog->m_formatComboBox, TQT_SIGNAL(activated( const TQString& )), - this, TQT_SLOT(formatChanged( const TQString& ))); - connect(m_dialog->m_delimiterBox, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(delimiterClicked(int))); - connect(m_dialog->m_delimiterEdit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(returnPressed())); - connect(m_dialog->m_delimiterEdit, TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT(formatChanged ( const TQString & ) )); - connect(m_dialog->m_comboQuote, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(textquoteSelected(const TQString &))); - connect(m_dialog->m_sheet, TQT_SIGNAL(currentChanged(int, int)), - this, TQT_SLOT(currentCellChanged(int, int))); - connect(m_dialog->m_ignoreDuplicates, TQT_SIGNAL(stateChanged(int)), - this, TQT_SLOT(ignoreDuplicatesChanged(int))); - connect(m_dialog->m_updateButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(updateClicked())); - connect(m_dialog->comboBoxEncoding, TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT(encodingChanged ( const TQString & ) )); + connect(m_dialog->m_formatComboBox, TQ_SIGNAL(activated( const TQString& )), + this, TQ_SLOT(formatChanged( const TQString& ))); + connect(m_dialog->m_delimiterBox, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(delimiterClicked(int))); + connect(m_dialog->m_delimiterEdit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(returnPressed())); + connect(m_dialog->m_delimiterEdit, TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT(formatChanged ( const TQString & ) )); + connect(m_dialog->m_comboQuote, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(textquoteSelected(const TQString &))); + connect(m_dialog->m_sheet, TQ_SIGNAL(currentChanged(int, int)), + this, TQ_SLOT(currentCellChanged(int, int))); + connect(m_dialog->m_ignoreDuplicates, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(ignoreDuplicatesChanged(int))); + connect(m_dialog->m_updateButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(updateClicked())); + connect(m_dialog->comboBoxEncoding, TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT(encodingChanged ( const TQString & ) )); } diff --git a/kchart/kchartBackgroundPixmapConfigPage.cpp b/kchart/kchartBackgroundPixmapConfigPage.cpp index 01e7a67f..d4bb9fb8 100644 --- a/kchart/kchartBackgroundPixmapConfigPage.cpp +++ b/kchart/kchartBackgroundPixmapConfigPage.cpp @@ -100,7 +100,7 @@ KChartBackgroundPixmapConfigPage::KChartBackgroundPixmapConfigPage( KChartParams TQWhatsThis::add( browsePB, i18n( "Click this button to select a background " "image not yet present in the list above. " ) ); center->addWidget( browsePB ); - connect( browsePB, TQT_SIGNAL( clicked() ), TQT_SLOT( slotBrowse() ) ); + connect( browsePB, TQ_SIGNAL( clicked() ), TQ_SLOT( slotBrowse() ) ); wallWidget = new TQWidget( this ); TQWhatsThis::add( wallWidget, i18n( "This area will always display the " @@ -110,8 +110,8 @@ KChartBackgroundPixmapConfigPage::KChartBackgroundPixmapConfigPage( KChartParams "it originally had." ) ); center->addWidget( wallWidget ); - connect( wallCB, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotWallPaperChanged( int ) ) ); + connect( wallCB, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotWallPaperChanged( int ) ) ); right = new TQVGroupBox( i18n( "Wallpaper Configuration" ), this ); TQWhatsThis::add( right, i18n( "In this box, you can set various settings " diff --git a/kchart/kchartColorConfigPage.cpp b/kchart/kchartColorConfigPage.cpp index c1691b28..2b9d4999 100644 --- a/kchart/kchartColorConfigPage.cpp +++ b/kchart/kchartColorConfigPage.cpp @@ -134,8 +134,8 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params, wtstr = i18n( "Choose a row/column in the list on the left and change its color using this button."); TQWhatsThis::add( _dataColorCB, wtstr ); initDataColorList(); - connect( _dataColorLB, TQT_SIGNAL(highlighted(int )), this, TQT_SLOT(changeIndex(int))); - connect( _dataColorLB, TQT_SIGNAL(doubleClicked ( TQListBoxItem * )), this, TQT_SLOT(activeColorButton())); + connect( _dataColorLB, TQ_SIGNAL(highlighted(int )), this, TQ_SLOT(changeIndex(int))); + connect( _dataColorLB, TQ_SIGNAL(doubleClicked ( TQListBoxItem * )), this, TQ_SLOT(activeColorButton())); diff --git a/kchart/kchartConfigDialog.cpp b/kchart/kchartConfigDialog.cpp index f0f57d62..e9f47660 100644 --- a/kchart/kchartConfigDialog.cpp +++ b/kchart/kchartConfigDialog.cpp @@ -191,8 +191,8 @@ KChartConfigDialog::KChartConfigDialog( KChartParams* params, #endif setCancelButton( i18n( "&Cancel" ) ); - connect( this, TQT_SIGNAL( applyButtonPressed() ), this, TQT_SLOT( apply() ) ); - connect( this, TQT_SIGNAL( defaultButtonPressed() ), this, TQT_SLOT( defaults() ) ); + connect( this, TQ_SIGNAL( applyButtonPressed() ), this, TQ_SLOT( apply() ) ); + connect( this, TQ_SIGNAL( defaultButtonPressed() ), this, TQ_SLOT( defaults() ) ); } diff --git a/kchart/kchartDataEditor.cpp b/kchart/kchartDataEditor.cpp index 544c41cb..4d6fdbf4 100644 --- a/kchart/kchartDataEditor.cpp +++ b/kchart/kchartDataEditor.cpp @@ -178,8 +178,8 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) : m_table->setRowMovingEnabled(true); m_table->setColumnMovingEnabled(true); - connect( m_table, TQT_SIGNAL( currentChanged(int, int) ), - this, TQT_SLOT( currentChanged(int, int) ) ); + connect( m_table, TQ_SIGNAL( currentChanged(int, int) ), + this, TQ_SLOT( currentChanged(int, int) ) ); // Create the Rows setting m_rowsLA = new TQLabel( i18n("# Rows:" ), page ); @@ -210,8 +210,8 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) : TDEIcon::DefaultState, KChartFactory::global() ) ); //m_insertRowButton = new TQPushButton( i18n("Insert Row") , page); - connect( m_insertRowButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( insertRow() ) ); + connect( m_insertRowButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( insertRow() ) ); m_removeRowButton = new TQPushButton( page ); m_removeRowButton->setPixmap( BarIcon( TQString("delete_table_row"), @@ -219,8 +219,8 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) : TDEIcon::DefaultState, KChartFactory::global() ) ); //m_removeRowButton = new TQPushButton( i18n("Remove Row") , page); - connect( m_removeRowButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeCurrentRow() ) ); + connect( m_removeRowButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeCurrentRow() ) ); m_insertColButton = new TQPushButton( page ); m_insertColButton->setPixmap( BarIcon( TQString("insert_table_col"), @@ -228,8 +228,8 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) : TDEIcon::DefaultState, KChartFactory::global() ) ); //m_insertColButton = new TQPushButton( i18n("Insert Column") , page); - connect( m_insertColButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( insertColumn() ) ); + connect( m_insertColButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( insertColumn() ) ); m_removeColButton = new TQPushButton( page ); m_removeColButton->setPixmap( BarIcon( TQString("delete_table_col"), @@ -237,8 +237,8 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) : TDEIcon::DefaultState, KChartFactory::global() ) ); //m_removeColButton = new TQPushButton( i18n("Remove Column") , page); - connect( m_removeColButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeCurrentColumn() ) ); + connect( m_removeColButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeCurrentColumn() ) ); // Start the layout. The buttons are at the top. TQVBoxLayout *topLayout = new TQVBoxLayout( page ); @@ -283,24 +283,24 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) : topLayout->setStretchFactor(insertRemoveLayout,1); // Connect signals from the spin boxes. - connect(m_rowsSB, TQT_SIGNAL(valueChangedSpecial(int)), - this, TQT_SLOT(setRows(int))); - connect(m_colsSB, TQT_SIGNAL(valueChangedSpecial(int)), - this, TQT_SLOT(setCols(int))); + connect(m_rowsSB, TQ_SIGNAL(valueChangedSpecial(int)), + this, TQ_SLOT(setRows(int))); + connect(m_colsSB, TQ_SIGNAL(valueChangedSpecial(int)), + this, TQ_SLOT(setCols(int))); #if 0 // -- Changed data editor to use top row and leftmost column for // series names and labels so this is no longer necessary. - connect(m_table->horizontalHeader(), TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(column_clicked(int)) ); - connect(m_table->verticalHeader(), TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(row_clicked(int)) ); + connect(m_table->horizontalHeader(), TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(column_clicked(int)) ); + connect(m_table->verticalHeader(), TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(row_clicked(int)) ); #endif - connect(m_table, TQT_SIGNAL(valueChanged(int, int)), - this, TQT_SLOT(tableChanged(int, int)) ); + connect(m_table, TQ_SIGNAL(valueChanged(int, int)), + this, TQ_SLOT(tableChanged(int, int)) ); // At first, assume that any shrinking of the table is a mistake. // A confirmation dialog will make sure that the user knows what diff --git a/kchart/kchartFontConfigPage.cpp b/kchart/kchartFontConfigPage.cpp index 27f91581..91d8c107 100644 --- a/kchart/kchartFontConfigPage.cpp +++ b/kchart/kchartFontConfigPage.cpp @@ -109,10 +109,10 @@ KChartFontConfigPage::KChartFontConfigPage( KChartParams* params, grid->setColStretch(2, 1); grid->setRowStretch(3, 1); - connect( m_fontButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changeLabelFont())); - connect( m_list, TQT_SIGNAL(doubleClicked ( TQListBoxItem * )), - this, TQT_SLOT(changeLabelFont())); + connect( m_fontButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changeLabelFont())); + connect( m_list, TQ_SIGNAL(doubleClicked ( TQListBoxItem * )), + this, TQ_SLOT(changeLabelFont())); // Enter the items into the list. initList(); diff --git a/kchart/kchartHeaderFooterConfigPage.cpp b/kchart/kchartHeaderFooterConfigPage.cpp index 8e11184e..24272cc1 100644 --- a/kchart/kchartHeaderFooterConfigPage.cpp +++ b/kchart/kchartHeaderFooterConfigPage.cpp @@ -58,7 +58,7 @@ KChartHeaderFooterConfigPage::KChartHeaderFooterConfigPage( KChartParams* params 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.")); layout->addWidget(titleFontButton,0,3); - connect( titleFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeTitleFont())); + connect( titleFontButton, TQ_SIGNAL(clicked()), this, TQ_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.")); @@ -75,7 +75,7 @@ KChartHeaderFooterConfigPage::KChartHeaderFooterConfigPage( KChartParams* params 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.")); layout->addWidget(subtitleFontButton,1,3); - connect( subtitleFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeSubtitleFont())); + connect( subtitleFontButton, TQ_SIGNAL(clicked()), this, TQ_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.")); @@ -91,7 +91,7 @@ KChartHeaderFooterConfigPage::KChartHeaderFooterConfigPage( KChartParams* params 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())); + connect( footerFontButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeFooterFont())); layout->addWidget(footerFontButton,2,3); layout->addItem( new TQSpacerItem( 5, 5, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 3, 0 ); diff --git a/kchart/kchartLegendConfigPage.cpp b/kchart/kchartLegendConfigPage.cpp index 1187cafb..0f4b07a2 100644 --- a/kchart/kchartLegendConfigPage.cpp +++ b/kchart/kchartLegendConfigPage.cpp @@ -125,10 +125,10 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, TQWhatsThis::add(textLegendFontButton, i18n("Click here to display the TDE font chooser dialog. You will be able to change the font family, style and size for the legend text.")); grid4->addWidget( textLegendFontButton, 3, 0 ); - connect( titleLegendFontButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changeTitleLegendFont())); - connect( textLegendFontButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changeTextLegendFont())); + connect( titleLegendFontButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changeTitleLegendFont())); + connect( textLegendFontButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changeTextLegendFont())); // 4. Block: Orientation orientationGroup = new TQVButtonGroup( i18n("Orientation"), this ); diff --git a/kchart/kchartLine3dConfigPage.cpp b/kchart/kchartLine3dConfigPage.cpp index f3750f73..fd600c0a 100644 --- a/kchart/kchartLine3dConfigPage.cpp +++ b/kchart/kchartLine3dConfigPage.cpp @@ -45,8 +45,8 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params, line3d=new TQCheckBox(i18n("3D lines"),this); grid1->addWidget(line3d,1,0); - connect(line3d, TQT_SIGNAL(toggled ( bool )), - this, TQT_SLOT(slotChange3DParameter(bool))); + connect(line3d, TQ_SIGNAL(toggled ( bool )), + this, TQ_SLOT(slotChange3DParameter(bool))); #endif // The line width label and input. diff --git a/kchart/kchartPageLayout.cpp b/kchart/kchartPageLayout.cpp index 434a5d2f..71417458 100644 --- a/kchart/kchartPageLayout.cpp +++ b/kchart/kchartPageLayout.cpp @@ -82,9 +82,9 @@ KChartPageLayout::KChartPageLayout( KChartParams* _params, TQWidget* parent, con grid->addWidget(bottomBorder,3,1); init(); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect( this, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), this ,TQT_SLOT( slotReset() )); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( slotApply() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), this ,TQ_SLOT( slotReset() )); } diff --git a/kchart/kchartParameter3dConfigPage.cpp b/kchart/kchartParameter3dConfigPage.cpp index 753f07a9..00f38e06 100644 --- a/kchart/kchartParameter3dConfigPage.cpp +++ b/kchart/kchartParameter3dConfigPage.cpp @@ -55,8 +55,8 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params, TQWhatsThis::add(bar3d, i18n("If checked, this will enable 3D mode for viewing the bars. You can then add a shadow and set the angle and depth for 3D.")); grid1->addWidget(bar3d,0,0); - connect(bar3d, TQT_SIGNAL(toggled ( bool )), - this, TQT_SLOT(slotChange3DParameter(bool))); + connect(bar3d, TQ_SIGNAL(toggled ( bool )), + this, TQ_SLOT(slotChange3DParameter(bool))); // Checkbox for shadows drawShadowColor=new TQCheckBox(i18n("Draw dark shadow"),gb); diff --git a/kchart/kchartParameterConfigPage.cpp b/kchart/kchartParameterConfigPage.cpp index 770b1c23..b86ccf12 100644 --- a/kchart/kchartParameterConfigPage.cpp +++ b/kchart/kchartParameterConfigPage.cpp @@ -63,13 +63,13 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params, yaxis = new TQCheckBox( i18n( "Y-axis" ), gb1); TQWhatsThis::add(yaxis, i18n("If this is checked, the Y-axis is shown. If you uncheck this option, the Y-axis and the Y grid lines will not be displayed anymore.")); - connect( yaxis, TQT_SIGNAL( clicked() ), this, TQT_SLOT( axisChanged() ) ); + connect( yaxis, TQ_SIGNAL( clicked() ), this, TQ_SLOT( axisChanged() ) ); grid1->addWidget(yaxis, 1, 0); //gb1->insert(yaxis); xaxis = new TQCheckBox( i18n( "X-axis" ), gb1 ); TQWhatsThis::add(xaxis, i18n("If this is checked, the X-axis is shown. If you uncheck this option, the X-axis and the X grid lines will not be displayed anymore.")); - connect( xaxis, TQT_SIGNAL( clicked() ), this, TQT_SLOT( axisChanged() ) ); + connect( xaxis, TQ_SIGNAL( clicked() ), this, TQ_SLOT( axisChanged() ) ); grid1->addWidget(xaxis, 2, 0); //gb1->insert(xaxis); @@ -131,8 +131,8 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params, automatic_precision->setChecked(true); max = new TQRadioButton( i18n("Decimal precision:"), precision); TQWhatsThis::add(max, i18n("This sets the Y-axis precision. For example, if you choose a precision of 2, the value 5 will be displayed as 5.00 alongside the Y-axis.")); - connect(automatic_precision, TQT_SIGNAL(toggled(bool)), this, - TQT_SLOT(automatic_precision_toggled(bool)) ); + connect(automatic_precision, TQ_SIGNAL(toggled(bool)), this, + TQ_SLOT(automatic_precision_toggled(bool)) ); maximum_length = new TQSpinBox(0, 15, 1, precision ); TQWhatsThis::add(maximum_length, i18n("Set the precision you want to display for the Y-axis, if you choose Decimal precision. The range is 0 to 15; 2 being the default.")); maximum_length->setValue(2); @@ -167,10 +167,10 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params, grid1->activate(); grid2->activate(); #endif - /*connect( grid, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( changeState( bool ) ) );*/ - /*connect( xaxis, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( changeXaxisState( bool ) ) );*/ + /*connect( grid, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( changeState( bool ) ) );*/ + /*connect( xaxis, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( changeXaxisState( bool ) ) );*/ } diff --git a/kchart/kchartParameterPieConfigPage.cpp b/kchart/kchartParameterPieConfigPage.cpp index d640333e..3ea70ece 100644 --- a/kchart/kchartParameterPieConfigPage.cpp +++ b/kchart/kchartParameterPieConfigPage.cpp @@ -71,7 +71,7 @@ KChartParameterPieConfigPage::KChartParameterPieConfigPage( KChartParams* params grid1->activate(); - connect(pie3d,TQT_SIGNAL(toggled ( bool )),this, TQT_SLOT(active3DPie(bool))); + connect(pie3d,TQ_SIGNAL(toggled ( bool )),this, TQ_SLOT(active3DPie(bool))); } void KChartParameterPieConfigPage::active3DPie(bool b) diff --git a/kchart/kchartPieConfigPage.cpp b/kchart/kchartPieConfigPage.cpp index 31ec42a6..a56a96c8 100644 --- a/kchart/kchartPieConfigPage.cpp +++ b/kchart/kchartPieConfigPage.cpp @@ -89,9 +89,9 @@ KChartPieConfigPage::KChartPieConfigPage( KChartParams* params, initList(); dist->setEnabled(false); - connect(column,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(changeValue(int))); + connect(column,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(changeValue(int))); - connect( list, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( slotselected(TQListViewItem *) ) ); + connect( list, TQ_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQ_SLOT( slotselected(TQListViewItem *) ) ); } diff --git a/kchart/kchartSubTypeChartPage.cpp b/kchart/kchartSubTypeChartPage.cpp index 9ccad59e..055d113d 100644 --- a/kchart/kchartSubTypeChartPage.cpp +++ b/kchart/kchartSubTypeChartPage.cpp @@ -57,8 +57,8 @@ KChartHiloSubTypeChartPage::KChartHiloSubTypeChartPage( KChartParams* params, percent = new TQRadioButton( i18n("HiLoOpenClose"), subtypeBG ); subtypeBG->insert( percent, KDChartParams::AreaPercent ); subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); - connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotChangeSubType( int ) ) ); + connect( subtypeBG, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotChangeSubType( int ) ) ); TQHGroupBox* exampleGB = new TQHGroupBox( i18n( "Example" ), this ); TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); @@ -136,8 +136,8 @@ KChartAreaSubTypeChartPage::KChartAreaSubTypeChartPage( KChartParams* params, percent = new TQRadioButton( i18n( "Percent" ), subtypeBG ); subtypeBG->insert( percent, KDChartParams::AreaPercent ); subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); - connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotChangeSubType( int ) ) ); + connect( subtypeBG, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotChangeSubType( int ) ) ); TQHGroupBox* exampleGB = new TQHGroupBox( i18n( "Example" ), this ); TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); @@ -220,8 +220,8 @@ KChartBarSubTypeChartPage::KChartBarSubTypeChartPage( KChartParams* params, subtypeBG->insert( percent, KDChartParams::BarPercent ); subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); - connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotChangeSubType( int ) ) ); + connect( subtypeBG, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotChangeSubType( int ) ) ); //TQHBox *hbox = new TQHBox( this ); new TQLabel( i18n( "Number of lines: "), left ); @@ -310,8 +310,8 @@ KChartLineSubTypeChartPage::KChartLineSubTypeChartPage( KChartParams* params, percent = new TQRadioButton( i18n( "Percent" ), subtypeBG ); subtypeBG->insert( percent, KDChartParams::AreaPercent ); subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); - connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotChangeSubType( int ) ) ); + connect( subtypeBG, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotChangeSubType( int ) ) ); TQHGroupBox* exampleGB = new TQHGroupBox( i18n( "Example" ), this ); TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); @@ -389,8 +389,8 @@ KChartPolarSubTypeChartPage::KChartPolarSubTypeChartPage( KChartParams* params, percent = new TQRadioButton( i18n( "Percent" ), subtypeBG ); subtypeBG->insert( percent, KDChartParams::AreaPercent ); subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); - connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotChangeSubType( int ) ) ); + connect( subtypeBG, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotChangeSubType( int ) ) ); TQHGroupBox* exampleGB = new TQHGroupBox( i18n( "Example" ), this ); TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); diff --git a/kchart/kchartWizard.cpp b/kchart/kchartWizard.cpp index 01e5bf45..9145c175 100644 --- a/kchart/kchartWizard.cpp +++ b/kchart/kchartWizard.cpp @@ -58,15 +58,15 @@ KChartWizard::KChartWizard ( KChartPart* _chart, TQWidget *parent, const char* n setNextEnabled(m_axespage, false); setHelpEnabled(m_axespage, false); - // connect( this, TQT_SIGNAL( finished() ), _selectdatapage, TQT_SLOT( apply() ) ); - connect(this, TQT_SIGNAL(finished()), m_dataFormatPage, TQT_SLOT(apply())); - connect(this, TQT_SIGNAL(finished()), m_chartTypePage, TQT_SLOT(apply())); - connect(this ,TQT_SIGNAL(finished()), m_chartSubtypePage, TQT_SLOT(apply())); - connect(this, TQT_SIGNAL(finished()), m_labelsLegendPage, TQT_SLOT(apply())); - connect(this, TQT_SIGNAL(finished()), m_axespage, TQT_SLOT(apply())); - - connect( m_chartTypePage, TQT_SIGNAL( chartChange( int ) ), - this, TQT_SLOT( subType( int ) ) ); + // connect( this, TQ_SIGNAL( finished() ), _selectdatapage, TQ_SLOT( apply() ) ); + connect(this, TQ_SIGNAL(finished()), m_dataFormatPage, TQ_SLOT(apply())); + connect(this, TQ_SIGNAL(finished()), m_chartTypePage, TQ_SLOT(apply())); + connect(this ,TQ_SIGNAL(finished()), m_chartSubtypePage, TQ_SLOT(apply())); + connect(this, TQ_SIGNAL(finished()), m_labelsLegendPage, TQ_SLOT(apply())); + connect(this, TQ_SIGNAL(finished()), m_axespage, TQ_SLOT(apply())); + + connect( m_chartTypePage, TQ_SIGNAL( chartChange( int ) ), + this, TQ_SLOT( subType( int ) ) ); adjustSize(); subType( m_chart->params()->chartType() ); diff --git a/kchart/kchartWizardLabelsLegendPage.cpp b/kchart/kchartWizardLabelsLegendPage.cpp index 3899a276..fdcf99f4 100644 --- a/kchart/kchartWizardLabelsLegendPage.cpp +++ b/kchart/kchartWizardLabelsLegendPage.cpp @@ -168,31 +168,31 @@ KChartWizardLabelsLegendPage::KChartWizardLabelsLegendPage( TQWidget* parent, KC title=_chart->params()->header1Font(); grid1->addWidget(tmpTQGroupBox,0,0); - connect(xtitlefont,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeXLabelFont())); - connect(ytitlefont,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeYLabelFont())); + connect(xtitlefont,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeXLabelFont())); + connect(ytitlefont,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeYLabelFont())); #if 0 - connect(ytitle2font,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeY2LabelFont())); + connect(ytitle2font,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeY2LabelFont())); #endif - connect(titlefont,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeTitleFont())); - connect(legendTitleFont,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeLegendTitleFont())); + connect(titlefont,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeTitleFont())); + connect(legendTitleFont,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeLegendTitleFont())); - connect(legendTextFont,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeLegendTextFont())); + connect(legendTextFont,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeLegendTextFont())); - connect(xtitlecolor,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeXLabelColor(const TQColor &))); - connect(ytitlecolor,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeYLabelColor(const TQColor &))); - connect(titlecolor,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeTitleColor(const TQColor &))); + connect(xtitlecolor,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeXLabelColor(const TQColor &))); + connect(ytitlecolor,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeYLabelColor(const TQColor &))); + connect(titlecolor,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeTitleColor(const TQColor &))); #if 0 - connect(ytitle2color,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeYTitle2Color(const TQColor &))); + connect(ytitle2color,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeYTitle2Color(const TQColor &))); #endif - connect(legendTitleColor,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeLegendTitleColor(const TQColor &))); + connect(legendTitleColor,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeLegendTitleColor(const TQColor &))); - connect(legendTextColor,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeLegendTextColor(const TQColor &))); + connect(legendTextColor,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeLegendTextColor(const TQColor &))); } diff --git a/kchart/kchartWizardSelectChartTypePage.cpp b/kchart/kchartWizardSelectChartTypePage.cpp index 8ea02100..a6ed817b 100644 --- a/kchart/kchartWizardSelectChartTypePage.cpp +++ b/kchart/kchartWizardSelectChartTypePage.cpp @@ -79,8 +79,8 @@ KChartWizardSelectChartTypePage::KChartWizardSelectChartTypePage( TQWidget* pare } m_type = m_chart->params()->chartType(); - connect( m_typeBG, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( chartTypeSelected( int ) ) ); + connect( m_typeBG, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( chartTypeSelected( int ) ) ); //// parent->resize( 425, 256 ); // parent->resize(xstep*5+50, ystep*4 + 100); diff --git a/kchart/kchartWizardSetupAxesPage.cpp b/kchart/kchartWizardSetupAxesPage.cpp index 5514e82b..49873149 100644 --- a/kchart/kchartWizardSetupAxesPage.cpp +++ b/kchart/kchartWizardSetupAxesPage.cpp @@ -189,15 +189,15 @@ KChartWizardSetupAxesPage::KChartWizardSetupAxesPage( TQWidget* parent, - connect(ylabelFont,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeLabelFont())); + connect(ylabelFont,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeLabelFont())); - connect(ylabelColor,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeLabelColor(const TQColor &))); - connect(borderColor,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeBorderColor(const TQColor &))); - connect(gridColor,TQT_SIGNAL(changed( const TQColor & )), - this,TQT_SLOT(changeGridColor(const TQColor &))); + connect(ylabelColor,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeLabelColor(const TQColor &))); + connect(borderColor,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeBorderColor(const TQColor &))); + connect(gridColor,TQ_SIGNAL(changed( const TQColor & )), + this,TQ_SLOT(changeGridColor(const TQColor &))); } diff --git a/kchart/kchartWizardSetupDataPage.cpp b/kchart/kchartWizardSetupDataPage.cpp index 1d057d4c..2e8725bb 100644 --- a/kchart/kchartWizardSetupDataPage.cpp +++ b/kchart/kchartWizardSetupDataPage.cpp @@ -27,16 +27,16 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent, datarow = new TQRadioButton( this, "RadioButton_1" ); datarow->setGeometry( 270, 40, 100, 20 ); datarow->setText( i18n("Rows") ); - connect( datarow, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( dataInRowsClicked() ) ); + connect( datarow, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( dataInRowsClicked() ) ); tmpTQGroupBox->insert( datarow ); datacol = new TQRadioButton( this, "RadioButton_2" ); datacol->setGeometry( 270, 60, 100, 20 ); datacol->setText( i18n("Columns") ); datacol->setChecked( true ); - connect( datarow, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( dataInColsClicked() ) ); + connect( datarow, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( dataInColsClicked() ) ); tmpTQGroupBox->insert( datacol ); TQLabel* tmpTQLabel; @@ -49,8 +49,8 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent, coldescript = new TQCheckBox( this, "CheckBox_3" ); coldescript->setGeometry( 260, 110, 20, 30 ); coldescript->setChecked( true ); - connect( coldescript, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( firstColumnIsDescriptionToggled( bool ) ) ); + connect( coldescript, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( firstColumnIsDescriptionToggled( bool ) ) ); coldescript->setText( "" ); descrBG->insert( coldescript ); @@ -61,8 +61,8 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent, rowdescript = new TQCheckBox( this, "CheckBox_4" ); rowdescript->setGeometry( 260, 150, 20, 30 ); - connect( rowdescript, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( firstRowIsDescriptionToggled( bool ) ) ); + connect( rowdescript, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( firstRowIsDescriptionToggled( bool ) ) ); rowdescript->setText( "" ); descrBG->insert( rowdescript ); diff --git a/kchart/kchart_part.cpp b/kchart/kchart_part.cpp index 1956904b..fffed0a0 100644 --- a/kchart/kchart_part.cpp +++ b/kchart/kchart_part.cpp @@ -693,7 +693,7 @@ bool KChartPart::showWizard( TQString &dataArea ) { KChartWizard *wizard = new KChartWizard( this, m_parentWidget, "wizard" ); - connect( wizard, TQT_SIGNAL(finished()), this, TQT_SLOT(slotModified()) ); + connect( wizard, TQ_SIGNAL(finished()), this, TQ_SLOT(slotModified()) ); wizard->setDataArea( dataArea ); diff --git a/kchart/kchart_view.cpp b/kchart/kchart_view.cpp index b7b7fba8..4b5e511d 100644 --- a/kchart/kchart_view.cpp +++ b/kchart/kchart_view.cpp @@ -65,100 +65,100 @@ KChartView::KChartView( KChartPart* part, TQWidget* parent, const char* name ) dcopObject(); // build it m_importData = new TDEAction( i18n( "Import Data..." ), 0, - this, TQT_SLOT( importData() ), + this, TQ_SLOT( importData() ), actionCollection(), "import_data" ); #if 0 TDEAction * actionExtraCreateTemplate = #endif new TDEAction( i18n( "&Create Template From Document..." ), 0, - this, TQT_SLOT( extraCreateTemplate() ), + this, TQ_SLOT( extraCreateTemplate() ), actionCollection(), "extra_template" ); m_wizard = new TDEAction( i18n("Customize with &Wizard..."), "wizard", 0, - this, TQT_SLOT( wizard() ), + this, TQ_SLOT( wizard() ), actionCollection(), "wizard"); m_edit = new TDEAction( i18n("Edit &Data..."), "edit", 0, - this, TQT_SLOT( editData() ), + this, TQ_SLOT( editData() ), actionCollection(), "editdata"); m_config = new TDEAction( i18n( "&Chart..." ), "configure", 0, - this, TQT_SLOT( slotConfig() ), + this, TQ_SLOT( slotConfig() ), actionCollection(), "config" ); // One TDEToggleAction per chart type m_chartbars = new TDEToggleAction( i18n("&Bar"), "chart_bar_3d", 0, this, - TQT_SLOT( barsChart() ), actionCollection(), + TQ_SLOT( barsChart() ), actionCollection(), "barschart"); m_chartbars->setExclusiveGroup( "charttypes" ); m_chartbars->setChecked( true ); m_chartline = new TDEToggleAction( i18n("&Line"), "chart_line", 0, this, - TQT_SLOT( lineChart() ), actionCollection(), + TQ_SLOT( lineChart() ), actionCollection(), "linechart"); m_chartline->setExclusiveGroup( "charttypes" ); m_chartareas = new TDEToggleAction( i18n("&Area"), "chart_area", 0, this, - TQT_SLOT( areasChart() ), actionCollection(), + TQ_SLOT( areasChart() ), actionCollection(), "areaschart"); m_chartareas->setExclusiveGroup( "charttypes" ); m_charthilo = new TDEToggleAction( i18n("&HiLo"), "chart_hilo", 0, this, - TQT_SLOT( hiLoChart() ), actionCollection(), + TQ_SLOT( hiLoChart() ), actionCollection(), "hilochart"); m_charthilo->setExclusiveGroup( "charttypes" ); m_chartbw = new TDEToggleAction( i18n("Bo&x && Whiskers"), "chart_boxwhisker", 0, this, - TQT_SLOT( bwChart() ), actionCollection(), + TQ_SLOT( bwChart() ), actionCollection(), "bwchart"); m_chartbw->setExclusiveGroup( "charttypes" ); m_chartpie = new TDEToggleAction( i18n("&Pie"), "chart_pie", 0, this, - TQT_SLOT( pieChart() ), actionCollection(), + TQ_SLOT( pieChart() ), actionCollection(), "piechart"); m_chartpie->setExclusiveGroup( "charttypes" ); m_chartring = new TDEToggleAction( i18n("&Ring"), "chart_ring", 0, this, - TQT_SLOT( ringChart() ), actionCollection(), + TQ_SLOT( ringChart() ), actionCollection(), "ringchart"); m_chartring->setExclusiveGroup( "charttypes" ); m_chartpolar = new TDEToggleAction( i18n("&Polar"), "chart_polar", 0, this, - TQT_SLOT( polarChart() ), actionCollection(), + TQ_SLOT( polarChart() ), actionCollection(), "polarchart"); m_chartpolar->setExclusiveGroup( "charttypes" ); // Configuration TDEActions m_colorConfig = new TDEAction( i18n( "&Colors..." ), 0, - this, TQT_SLOT( slotConfigColor() ), + this, TQ_SLOT( slotConfigColor() ), actionCollection(), "color_config" ); m_fontConfig = new TDEAction( i18n( "&Font..." ), 0, - this, TQT_SLOT( slotConfigFont() ), + this, TQ_SLOT( slotConfigFont() ), actionCollection(), "font_config" ); m_backConfig = new TDEAction( i18n( "&Background..." ), 0, - this, TQT_SLOT( slotConfigBack() ), + this, TQ_SLOT( slotConfigBack() ), actionCollection(), "back_config" ); m_legendConfig = new TDEAction( i18n( "&Legend..." ), 0, - this, TQT_SLOT( slotConfigLegend() ), + this, TQ_SLOT( slotConfigLegend() ), actionCollection(), "legend_config" ); m_subTypeChartConfig = new TDEAction( i18n( "Chart &Sub-type..." ), 0, - this, TQT_SLOT( slotConfigSubTypeChart() ), + this, TQ_SLOT( slotConfigSubTypeChart() ), actionCollection(), "legend_subtype" ); m_dataFormatConfig = new TDEAction( i18n( "&Data Format..." ), 0, - this, TQT_SLOT( slotConfigDataFormat() ), + this, TQ_SLOT( slotConfigDataFormat() ), actionCollection(), "data_format" ); m_headerFooterConfig = new TDEAction( i18n( "&Header && Footer..." ), 0, - this, TQT_SLOT( slotConfigHeaderFooterChart() ), + this, TQ_SLOT( slotConfigHeaderFooterChart() ), actionCollection(), "headerfooter_subtype" ); m_pageLayoutConfig = new TDEAction( i18n( "Page Layout..." ), 0, - this, TQT_SLOT( slotConfigPageLayout() ), + this, TQ_SLOT( slotConfigPageLayout() ), actionCollection(), "page_layout" ); // initialize the configuration @@ -230,8 +230,8 @@ void KChartView::editData() ed.setColLabels(((KChartPart*)koDocument())->colLabelTexts()); // Activate the Apply button in the editor. - connect(&ed, TQT_SIGNAL(applyClicked(kchartDataEditor *)), - this, TQT_SLOT(applyEdit(kchartDataEditor *))); + connect(&ed, TQ_SIGNAL(applyClicked(kchartDataEditor *)), + this, TQ_SLOT(applyEdit(kchartDataEditor *))); // Execute the data editor. if ( ed.exec() != TQDialog::Accepted ) { @@ -339,8 +339,8 @@ void KChartView::config(int flags) KChartConfigDialog *d = new KChartConfigDialog( params, this, flags, dat ); - connect( d, TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( slotRepaint() ) ); + connect( d, TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( slotRepaint() ) ); d->exec(); delete d; } @@ -611,8 +611,8 @@ void KChartView::slotConfigPageLayout() KChartPageLayout *dialog = new KChartPageLayout(params, this, "Page Layout"); - connect( dialog, TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( slotRepaint() ) ); + connect( dialog, TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( slotRepaint() ) ); dialog->exec(); delete dialog; |