diff options
Diffstat (limited to 'kchart')
24 files changed, 113 insertions, 113 deletions
diff --git a/kchart/csvimportdialog.cc b/kchart/csvimportdialog.cc index 38cfd8c2..618f7b5a 100644 --- a/kchart/csvimportdialog.cc +++ b/kchart/csvimportdialog.cc @@ -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); diff --git a/kchart/csvimportdialogui.ui b/kchart/csvimportdialogui.ui index a061c0cc..3ba48c10 100644 --- a/kchart/csvimportdialogui.ui +++ b/kchart/csvimportdialogui.ui @@ -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> @@ -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/kchartColorConfigPage.cc b/kchart/kchartColorConfigPage.cc index d5666802..cae1689b 100644 --- a/kchart/kchartColorConfigPage.cc +++ b/kchart/kchartColorConfigPage.cc @@ -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); diff --git a/kchart/kchartComboConfigPage.cc b/kchart/kchartComboConfigPage.cc index 72453584..4016e14c 100644 --- a/kchart/kchartComboConfigPage.cc +++ b/kchart/kchartComboConfigPage.cc @@ -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()); diff --git a/kchart/kchartDataConfigPage.cc b/kchart/kchartDataConfigPage.cc index 3766903c..cbe1f30f 100644 --- a/kchart/kchartDataConfigPage.cc +++ b/kchart/kchartDataConfigPage.cc @@ -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..e264fbd0 100644 --- a/kchart/kchartDataEditor.cc +++ b/kchart/kchartDataEditor.cc @@ -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 diff --git a/kchart/kchartFontConfigPage.cc b/kchart/kchartFontConfigPage.cc index eef71cb6..846774c1 100644 --- a/kchart/kchartFontConfigPage.cc +++ b/kchart/kchartFontConfigPage.cc @@ -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/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc index 39d99963..d7583a35 100644 --- a/kchart/kchartLegendConfigPage.cc +++ b/kchart/kchartLegendConfigPage.cc @@ -98,7 +98,7 @@ 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 ); + gb->setAlignment( TQt::AlignLeft ); tqlayout->addMultiCellWidget( gb, 1,2, 0,0 ); // 3. Block: Font diff --git a/kchart/kchartLine3dConfigPage.cc b/kchart/kchartLine3dConfigPage.cc index adf56a3d..7b70ccfd 100644 --- a/kchart/kchartLine3dConfigPage.cc +++ b/kchart/kchartLine3dConfigPage.cc @@ -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 diff --git a/kchart/kchartParameter3dConfigPage.cc b/kchart/kchartParameter3dConfigPage.cc index 760c9786..b1a0b199 100644 --- a/kchart/kchartParameter3dConfigPage.cc +++ b/kchart/kchartParameter3dConfigPage.cc @@ -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); diff --git a/kchart/kchartPieConfigPage.cc b/kchart/kchartPieConfigPage.cc index 9a71b9b1..abef14c9 100644 --- a/kchart/kchartPieConfigPage.cc +++ b/kchart/kchartPieConfigPage.cc @@ -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/kchartSubTypeChartPage.cc b/kchart/kchartSubTypeChartPage.cc index 13585d7a..0f7b4ca5 100644 --- a/kchart/kchartSubTypeChartPage.cc +++ b/kchart/kchartSubTypeChartPage.cc @@ -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,7 +219,7 @@ 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 ) ) ); @@ -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/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/kchartWizardSelectDataFormatPage.cc b/kchart/kchartWizardSelectDataFormatPage.cc index 38606259..e7ab0ba8 100644 --- a/kchart/kchartWizardSelectDataFormatPage.cc +++ b/kchart/kchartWizardSelectDataFormatPage.cc @@ -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/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/kdchart/KDChart.cpp b/kchart/kdchart/KDChart.cpp index 415f013a..5d0c6bf2 100644 --- a/kchart/kdchart/KDChart.cpp +++ b/kchart/kdchart/KDChart.cpp @@ -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,19 +431,19 @@ 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" ) + globals += TQString::fromLatin1( "const KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT=\"%1\";\n" ) + .tqarg( 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" ) .tqarg(KDCHART_DEFAULT_AXIS_GRID_COLOR.name()); - globals += TQString::tqfromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" ) + globals += TQString::fromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" ) .tqarg( (KDCHART_DATA_VALUE_AUTO_COLOR)->name()); @@ -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/KDChartAxesPainter.cpp b/kchart/kdchart/KDChartAxesPainter.cpp index 6124abe8..3f3b312a 100644 --- a/kchart/kdchart/KDChartAxesPainter.cpp +++ b/kchart/kdchart/KDChartAxesPainter.cpp @@ -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, @@ -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/KDChartObjectFactory.cpp b/kchart/kdchart/KDChartObjectFactory.cpp index b1dac73e..6e2a1284 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; diff --git a/kchart/kdchart/KDChartPainter.cpp b/kchart/kdchart/KDChartPainter.cpp index 156d5d82..df608579 100644 --- a/kchart/kdchart/KDChartPainter.cpp +++ b/kchart/kdchart/KDChartPainter.cpp @@ -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; diff --git a/kchart/kdchart/KDChartPiePainter.cpp b/kchart/kdchart/KDChartPiePainter.cpp index ada03b44..44f4c60c 100644 --- a/kchart/kdchart/KDChartPiePainter.cpp +++ b/kchart/kdchart/KDChartPiePainter.cpp @@ -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..9ebed863 100644 --- a/kchart/kdchart/KDChartPolarPainter.cpp +++ b/kchart/kdchart/KDChartPolarPainter.cpp @@ -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/KDChartRingPainter.cpp b/kchart/kdchart/KDChartRingPainter.cpp index 9740fa5e..8797da5b 100644 --- a/kchart/kdchart/KDChartRingPainter.cpp +++ b/kchart/kdchart/KDChartRingPainter.cpp @@ -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/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; |