diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-25 05:28:35 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-25 05:28:35 +0000 |
| commit | f008adb5a77e094eaf6abf3fc0f36958e66896a5 (patch) | |
| tree | 8e9244c4d4957c36be81e15b566b4aa5ea26c982 /kspread/dialogs | |
| parent | 1210f27b660efb7b37ff43ec68763e85a403471f (diff) | |
| download | koffice-f008adb5a77e094eaf6abf3fc0f36958e66896a5.tar.gz koffice-f008adb5a77e094eaf6abf3fc0f36958e66896a5.zip | |
TQt4 port koffice
This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kspread/dialogs')
66 files changed, 3000 insertions, 2946 deletions
diff --git a/kspread/dialogs/SheetSelectWidget.ui b/kspread/dialogs/SheetSelectWidget.ui index c42989ae3..525b83f3a 100644 --- a/kspread/dialogs/SheetSelectWidget.ui +++ b/kspread/dialogs/SheetSelectWidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SheetSelectWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SheetSelectWidget</cstring> </property> @@ -254,7 +254,7 @@ It is even possible to print a sheet more than once. Just insert the desired she <tabstop>ButtonMoveDown</tabstop> <tabstop>ButtonMoveBottom</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kspread/dialogs/font_cell_format.ui b/kspread/dialogs/font_cell_format.ui index fa56db728..3bb6b78a3 100644 --- a/kspread/dialogs/font_cell_format.ui +++ b/kspread/dialogs/font_cell_format.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>FontTab</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>FontTab</cstring> </property> @@ -20,15 +20,15 @@ The default font is set for all cells in the Format -> Style Manager menu wit <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Varying (No Change)</string> @@ -54,7 +54,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit <string>Choose the style for your font for the currently selected cells. When you select several cells with different styles, the displayed style is set to Varying (No Change) and leaving it that way will keep all your current style settings for each cell. Changing to Roman for example will change all the selected cells style text to Roman.</string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>Varying (No Change)</string> @@ -80,7 +80,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit <string>Choose the weight for your font for the currently selected cells. When you select several cells with different font weight, the displayed weight is set to Varying (No Change) and leaving it that way will keep all your current weight settings for each cell. Changing to Bold for example will change all the selected cells font weight to Bold.</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -88,7 +88,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit <string>Color:</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>underline</cstring> </property> @@ -99,7 +99,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit <string>If this is checked, the current cell text wil be underlined.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -107,7 +107,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit <string>Size:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -115,7 +115,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit <string>Weight:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -134,7 +134,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit <string>Choose the color for the current cell text. Clicking on the color bar will bring you the standard KDE Select Color dialog where you will be able to choose the new color.</string> </property> </widget> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>strike</cstring> </property> @@ -145,7 +145,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit <string>This will strike out the current cell text if this is checked.</string> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>size_combo</cstring> </property> @@ -168,14 +168,14 @@ The default font is set for all cells in the Format -> Style Manager menu wit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>41</height> </size> </property> </spacer> - <widget class="QListBox" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQListBox" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>family_combo</cstring> </property> @@ -183,7 +183,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit <string>This box lists all your available font families. Click on one family to set it in the current cell.</string> </property> </widget> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -194,7 +194,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>example_label</cstring> </property> @@ -206,7 +206,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit <verstretch>0</verstretch> </sizepolicy> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignHCenter</set> </property> <property name="whatsThis" stdset="0"> @@ -219,7 +219,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/kspread/dialogs/kspread_dlg_angle.cc b/kspread/dialogs/kspread_dlg_angle.cc index 8dc31e1c4..dc633c553 100644 --- a/kspread/dialogs/kspread_dlg_angle.cc +++ b/kspread/dialogs/kspread_dlg_angle.cc @@ -21,8 +21,8 @@ * Boston, MA 02110-1301, USA. */ -#include <qlayout.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqpushbutton.h> #include <kbuttonbox.h> #include <kdebug.h> @@ -38,29 +38,29 @@ using namespace KSpread; -AngleDialog::AngleDialog(View* parent, const char* name, const QPoint &_marker) - : KDialogBase( parent, name,TRUE,i18n("Change Angle" ), Ok|Cancel|Default ) +AngleDialog::AngleDialog(View* tqparent, const char* name, const TQPoint &_marker) + : KDialogBase( tqparent, name,TRUE,i18n("Change Angle" ), Ok|Cancel|Default ) { - m_pView=parent; + m_pView=tqparent; marker=_marker; - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QVBoxLayout *lay = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *lay = new TQVBoxLayout( page, 0, spacingHint() ); m_pAngle = new KIntNumInput( page ); m_pAngle->setRange( -90, 90, 1 ); m_pAngle->setLabel( i18n("Angle:") ); m_pAngle->setSuffix(" "); lay->addWidget( m_pAngle ); - QWidget* spacer = new QWidget( page ); - spacer->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding ) ); + TQWidget* spacer = new TQWidget( page ); + spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ) ); lay->addWidget( spacer ); m_pAngle->setFocus(); - connect( this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) ); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); Cell *cell = m_pView->activeSheet()->cellAt( marker.x(), marker.y() ); int angle=-(cell->format()->getAngle(marker.x(), marker.y())); diff --git a/kspread/dialogs/kspread_dlg_angle.h b/kspread/dialogs/kspread_dlg_angle.h index 0f2fc4476..26ce07e1f 100644 --- a/kspread/dialogs/kspread_dlg_angle.h +++ b/kspread/dialogs/kspread_dlg_angle.h @@ -35,15 +35,16 @@ class View; class AngleDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AngleDialog( View* parent,const char* name,const QPoint &_marker); + AngleDialog( View* tqparent,const char* name,const TQPoint &_marker); public slots: void slotOk(); void slotDefault(); protected: View* m_pView; - QPoint marker; + TQPoint marker; KIntNumInput *m_pAngle; }; diff --git a/kspread/dialogs/kspread_dlg_area.cc b/kspread/dialogs/kspread_dlg_area.cc index 7932ad137..880b357be 100644 --- a/kspread/dialogs/kspread_dlg_area.cc +++ b/kspread/dialogs/kspread_dlg_area.cc @@ -21,9 +21,9 @@ * Boston, MA 02110-1301, USA. */ -#include <qlayout.h> -#include <qlabel.h> -#include <qlineedit.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqlineedit.h> #include <kmessagebox.h> @@ -37,46 +37,46 @@ using namespace KSpread; -AreaDialog::AreaDialog( View * parent, const char * name, const QPoint & _marker ) - : KDialogBase( parent, name, TRUE, i18n("Area Name"), Ok | Cancel ) +AreaDialog::AreaDialog( View * tqparent, const char * name, const TQPoint & _marker ) + : KDialogBase( tqparent, name, TRUE, i18n("Area Name"), Ok | Cancel ) { - m_pView = parent; + m_pView = tqparent; m_marker = _marker; - QWidget * page = new QWidget( this ); + TQWidget * page = new TQWidget( this ); setMainWidget(page); - QVBoxLayout * lay1 = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout * lay1 = new TQVBoxLayout( page, 0, spacingHint() ); - QLabel * label = new QLabel( i18n("Enter the area name:"), page ); + TQLabel * label = new TQLabel( i18n("Enter the area name:"), page ); lay1->addWidget( label ); - m_areaName = new QLineEdit(page); - m_areaName->setMinimumWidth( m_areaName->sizeHint().width() * 3 ); + m_areaName = new TQLineEdit(page); + m_areaName->setMinimumWidth( m_areaName->tqsizeHint().width() * 3 ); lay1->addWidget( m_areaName ); m_areaName->setFocus(); - connect ( m_areaName, SIGNAL(textChanged ( const QString & )), this, SLOT(slotAreaNamechanged( const QString &))); - connect( this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) ); + connect ( m_areaName, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(slotAreaNamechanged( const TQString &))); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); enableButtonOK(!m_areaName->text().isEmpty()); } -void AreaDialog::slotAreaNamechanged( const QString & text) +void AreaDialog::slotAreaNamechanged( const TQString & text) { enableButtonOK(!text.isEmpty()); } void AreaDialog::slotOk() { - QString tmp(m_areaName->text()); + TQString tmp(m_areaName->text()); if( !tmp.isEmpty() ) { tmp = tmp.lower(); - QRect rect( m_pView->selectionInfo()->selection() ); + TQRect rect( m_pView->selectionInfo()->selection() ); bool newName = true; - QValueList<Reference>::Iterator it; - QValueList<Reference> area = m_pView->doc()->listArea(); + TQValueList<Reference>::Iterator it; + TQValueList<Reference> area = m_pView->doc()->listArea(); for ( it = area.begin(); it != area.end(); ++it ) { if(tmp == (*it).ref_name) diff --git a/kspread/dialogs/kspread_dlg_area.h b/kspread/dialogs/kspread_dlg_area.h index 302715c8e..6236cf85e 100644 --- a/kspread/dialogs/kspread_dlg_area.h +++ b/kspread/dialogs/kspread_dlg_area.h @@ -26,9 +26,9 @@ #include <kdialogbase.h> -class QPushButton; -class QLineEdit; -class QLabel; +class TQPushButton; +class TQLineEdit; +class TQLabel; namespace KSpread { @@ -37,17 +37,18 @@ class View; class AreaDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AreaDialog( View * parent, const char * name, const QPoint & _marker ); + AreaDialog( View * tqparent, const char * name, const TQPoint & _marker ); public slots: void slotOk(); - void slotAreaNamechanged( const QString & text); + void slotAreaNamechanged( const TQString & text); protected: View * m_pView; - QLineEdit * m_areaName; - QPoint m_marker; + TQLineEdit * m_areaName; + TQPoint m_marker; }; } // namespace KSpread diff --git a/kspread/dialogs/kspread_dlg_comment.cc b/kspread/dialogs/kspread_dlg_comment.cc index 79ce9c490..603ceae54 100644 --- a/kspread/dialogs/kspread_dlg_comment.cc +++ b/kspread/dialogs/kspread_dlg_comment.cc @@ -21,9 +21,9 @@ * Boston, MA 02110-1301, USA. */ -#include <qmultilineedit.h> -#include <qpushbutton.h> -#include <qlayout.h> +#include <tqmultilineedit.h> +#include <tqpushbutton.h> +#include <tqlayout.h> #include <klocale.h> #include <kbuttonbox.h> @@ -38,16 +38,16 @@ using namespace KSpread; -CommentDialog::CommentDialog( View* parent, const char* name,const QPoint &_marker) - : KDialogBase( parent, name,TRUE,i18n("Cell Comment"),Ok|Cancel ) +CommentDialog::CommentDialog( View* tqparent, const char* name,const TQPoint &_marker) + : KDialogBase( tqparent, name,TRUE,i18n("Cell Comment"),Ok|Cancel ) { - m_pView = parent; + m_pView = tqparent; marker= _marker; - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QVBoxLayout *lay1 = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); - multiLine = new QMultiLineEdit( page ); + multiLine = new TQMultiLineEdit( page ); lay1->addWidget(multiLine); multiLine->setFocus(); @@ -57,8 +57,8 @@ CommentDialog::CommentDialog( View* parent, const char* name,const QPoint &_mark if(!cell->format()->comment(marker.x(),marker.y()).isEmpty()) multiLine->setText(cell->format()->comment(marker.x(),marker.y())); - connect( this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) ); - connect(multiLine, SIGNAL(textChanged ()),this, SLOT(slotTextChanged())); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect(multiLine, TQT_SIGNAL(textChanged ()),this, TQT_SLOT(slotTextChanged())); slotTextChanged(); diff --git a/kspread/dialogs/kspread_dlg_comment.h b/kspread/dialogs/kspread_dlg_comment.h index 21636d35f..e44aed81a 100644 --- a/kspread/dialogs/kspread_dlg_comment.h +++ b/kspread/dialogs/kspread_dlg_comment.h @@ -26,8 +26,8 @@ #include <kdialogbase.h> -class QPushButton; -class QMultiLineEdit; +class TQPushButton; +class TQMultiLineEdit; namespace KSpread { @@ -37,8 +37,9 @@ class View; class CommentDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CommentDialog( View* parent, const char* name,const QPoint &_marker ); + CommentDialog( View* tqparent, const char* name,const TQPoint &_marker ); public slots: void slotOk(); @@ -46,8 +47,8 @@ public slots: protected: View* m_pView; - QMultiLineEdit *multiLine; - QPoint marker; + TQMultiLineEdit *multiLine; + TQPoint marker; }; } // namespace KSpread diff --git a/kspread/dialogs/kspread_dlg_conditional.cc b/kspread/dialogs/kspread_dlg_conditional.cc index e9289d3f3..b19900c1c 100644 --- a/kspread/dialogs/kspread_dlg_conditional.cc +++ b/kspread/dialogs/kspread_dlg_conditional.cc @@ -41,28 +41,28 @@ #include <KoGlobal.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> using namespace KSpread; -ConditionalWidget::ConditionalWidget( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +ConditionalWidget::ConditionalWidget( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { - QGridLayout * Form1Layout = new QGridLayout( this, 1, 1, 11, 6, "Form1Layout"); + TQGridLayout * Form1Layout = new TQGridLayout( this, 1, 1, 11, 6, "Form1Layout"); - QGroupBox * groupBox1_3 = new QGroupBox( this, "groupBox1_3" ); + TQGroupBox * groupBox1_3 = new TQGroupBox( this, "groupBox1_3" ); groupBox1_3->setColumnLayout(0, Qt::Vertical ); - groupBox1_3->layout()->setSpacing( KDialog::spacingHint() ); - groupBox1_3->layout()->setMargin( KDialog::marginHint() ); - QGridLayout * groupBox1_3Layout = new QGridLayout( groupBox1_3->layout() ); - groupBox1_3Layout->setAlignment( Qt::AlignTop ); + groupBox1_3->tqlayout()->setSpacing( KDialog::spacingHint() ); + groupBox1_3->tqlayout()->setMargin( KDialog::marginHint() ); + TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->tqlayout() ); + groupBox1_3Layout->tqsetAlignment( TQt::AlignTop ); - QLabel * textLabel1_3 = new QLabel( groupBox1_3, "textLabel1_3" ); + TQLabel * textLabel1_3 = new TQLabel( groupBox1_3, "textLabel1_3" ); groupBox1_3Layout->addWidget( textLabel1_3, 0, 0 ); - m_condition_3 = new QComboBox( false, groupBox1_3, "m_condition_3" ); + m_condition_3 = new TQComboBox( false, groupBox1_3, "m_condition_3" ); groupBox1_3Layout->addWidget( m_condition_3, 0, 1 ); m_firstValue_3 = new KLineEdit( groupBox1_3, "m_firstValue_3" ); @@ -73,38 +73,38 @@ ConditionalWidget::ConditionalWidget( QWidget* parent, const char* name, WFlags m_secondValue_3->setEnabled( false ); groupBox1_3Layout->addWidget( m_secondValue_3, 0, 3 ); - m_style_3 = new QComboBox( false, groupBox1_3, "m_style_3" ); + m_style_3 = new TQComboBox( false, groupBox1_3, "m_style_3" ); m_style_3->setEnabled( false ); groupBox1_3Layout->addWidget( m_style_3, 1, 1 ); - QLabel * textLabel2_3 = new QLabel( groupBox1_3, "textLabel2_3" ); + TQLabel * textLabel2_3 = new TQLabel( groupBox1_3, "textLabel2_3" ); groupBox1_3Layout->addWidget( textLabel2_3, 1, 0 ); - QSpacerItem * spacer = new QSpacerItem( 41, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem * spacer = new TQSpacerItem( 41, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); groupBox1_3Layout->addItem( spacer, 1, 2 ); - QSpacerItem * spacer_2 = new QSpacerItem( 61, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem * spacer_2 = new TQSpacerItem( 61, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); groupBox1_3Layout->addItem( spacer_2, 1, 3 ); Form1Layout->addWidget( groupBox1_3, 2, 0 ); - QGroupBox * groupBox1_2 = new QGroupBox( this, "groupBox1_2" ); + TQGroupBox * groupBox1_2 = new TQGroupBox( this, "groupBox1_2" ); groupBox1_2->setColumnLayout(0, Qt::Vertical ); - groupBox1_2->layout()->setSpacing( KDialog::spacingHint() ); - groupBox1_2->layout()->setMargin( KDialog::marginHint() ); + groupBox1_2->tqlayout()->setSpacing( KDialog::spacingHint() ); + groupBox1_2->tqlayout()->setMargin( KDialog::marginHint() ); - QGridLayout * groupBox1_2Layout = new QGridLayout( groupBox1_2->layout() ); - groupBox1_2Layout->setAlignment( Qt::AlignTop ); + TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->tqlayout() ); + groupBox1_2Layout->tqsetAlignment( TQt::AlignTop ); - QLabel * textLabel1_2 = new QLabel( groupBox1_2, "textLabel1_2" ); + TQLabel * textLabel1_2 = new TQLabel( groupBox1_2, "textLabel1_2" ); groupBox1_2Layout->addWidget( textLabel1_2, 0, 0 ); - QLabel * textLabel2_2 = new QLabel( groupBox1_2, "textLabel2_2" ); + TQLabel * textLabel2_2 = new TQLabel( groupBox1_2, "textLabel2_2" ); groupBox1_2Layout->addWidget( textLabel2_2, 1, 0 ); - m_condition_2 = new QComboBox( false, groupBox1_2, "m_condition_2" ); + m_condition_2 = new TQComboBox( false, groupBox1_2, "m_condition_2" ); groupBox1_2Layout->addWidget( m_condition_2, 0, 1 ); - m_style_2 = new QComboBox( false, groupBox1_2, "m_style_2" ); + m_style_2 = new TQComboBox( false, groupBox1_2, "m_style_2" ); m_style_2->setEnabled( false ); groupBox1_2Layout->addWidget( m_style_2, 1, 1 ); @@ -117,30 +117,30 @@ ConditionalWidget::ConditionalWidget( QWidget* parent, const char* name, WFlags groupBox1_2Layout->addWidget( m_secondValue_2, 0, 3 ); - QSpacerItem * spacer_3 = new QSpacerItem( 41, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem * spacer_3 = new TQSpacerItem( 41, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); groupBox1_2Layout->addItem( spacer_3, 1, 2 ); - QSpacerItem * spacer_4 = new QSpacerItem( 61, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem * spacer_4 = new TQSpacerItem( 61, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); groupBox1_2Layout->addItem( spacer_4, 1, 3 ); Form1Layout->addWidget( groupBox1_2, 1, 0 ); - QGroupBox * groupBox1_1 = new QGroupBox( this, "groupBox1_1" ); + TQGroupBox * groupBox1_1 = new TQGroupBox( this, "groupBox1_1" ); groupBox1_1->setColumnLayout(0, Qt::Vertical ); - groupBox1_1->layout()->setSpacing( KDialog::spacingHint() ); - groupBox1_1->layout()->setMargin( KDialog::marginHint() ); + groupBox1_1->tqlayout()->setSpacing( KDialog::spacingHint() ); + groupBox1_1->tqlayout()->setMargin( KDialog::marginHint() ); - QGridLayout * groupBox1_1Layout = new QGridLayout( groupBox1_1->layout() ); - groupBox1_1Layout->setAlignment( Qt::AlignTop ); + TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->tqlayout() ); + groupBox1_1Layout->tqsetAlignment( TQt::AlignTop ); - QLabel * textLabel1_1 = new QLabel( groupBox1_1, "textLabel1_2_2" ); + TQLabel * textLabel1_1 = new TQLabel( groupBox1_1, "textLabel1_2_2" ); groupBox1_1Layout->addWidget( textLabel1_1, 0, 0 ); - QLabel * textLabel2_1 = new QLabel( groupBox1_1, "textLabel2_2_2" ); + TQLabel * textLabel2_1 = new TQLabel( groupBox1_1, "textLabel2_2_2" ); groupBox1_1Layout->addWidget( textLabel2_1, 1, 0 ); - m_condition_1 = new QComboBox( false, groupBox1_1, "m_condition_1" ); + m_condition_1 = new TQComboBox( false, groupBox1_1, "m_condition_1" ); groupBox1_1Layout->addWidget( m_condition_1, 0, 1 ); - m_style_1 = new QComboBox( false, groupBox1_1, "m_style_1" ); + m_style_1 = new TQComboBox( false, groupBox1_1, "m_style_1" ); m_style_1->setEnabled( false ); groupBox1_1Layout->addWidget( m_style_1, 1, 1 ); @@ -152,16 +152,16 @@ ConditionalWidget::ConditionalWidget( QWidget* parent, const char* name, WFlags m_secondValue_1->setEnabled( false ); groupBox1_1Layout->addWidget( m_secondValue_1, 0, 3 ); - QSpacerItem * spacer_5 = new QSpacerItem( 41, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem * spacer_5 = new TQSpacerItem( 41, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); groupBox1_1Layout->addItem( spacer_5, 1, 2 ); - QSpacerItem * spacer_6 = new QSpacerItem( 61, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem * spacer_6 = new TQSpacerItem( 61, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); groupBox1_1Layout->addItem( spacer_6, 1, 3 ); Form1Layout->addWidget( groupBox1_1, 0, 0 ); - resize( QSize(702, 380).expandedTo( minimumSizeHint() ) ); + resize( TQSize(702, 380).expandedTo( tqminimumSizeHint() ) ); clearWState( WState_Polished ); - QStringList list; + TQStringList list; list += i18n( "<none>" ); list += i18n( "equal to" ); list += i18n( "greater than" ); @@ -189,16 +189,16 @@ ConditionalWidget::ConditionalWidget( QWidget* parent, const char* name, WFlags textLabel2_2->setText( i18n( "Cell style" ) ); textLabel2_3->setText( i18n( "Cell style" ) ); - connect( m_condition_1, SIGNAL( highlighted( const QString & ) ), this, SLOT( slotTextChanged1( const QString & ) ) ); - connect( m_condition_2, SIGNAL( highlighted( const QString & ) ), this, SLOT( slotTextChanged2( const QString & ) ) ); - connect( m_condition_3, SIGNAL( highlighted( const QString & ) ), this, SLOT( slotTextChanged3( const QString & ) ) ); + connect( m_condition_1, TQT_SIGNAL( highlighted( const TQString & ) ), this, TQT_SLOT( slotTextChanged1( const TQString & ) ) ); + connect( m_condition_2, TQT_SIGNAL( highlighted( const TQString & ) ), this, TQT_SLOT( slotTextChanged2( const TQString & ) ) ); + connect( m_condition_3, TQT_SIGNAL( highlighted( const TQString & ) ), this, TQT_SLOT( slotTextChanged3( const TQString & ) ) ); } ConditionalWidget::~ConditionalWidget() { } -void ConditionalWidget::slotTextChanged1( const QString & text ) +void ConditionalWidget::slotTextChanged1( const TQString & text ) { if ( text == i18n( "<none>" ) ) { @@ -223,7 +223,7 @@ void ConditionalWidget::slotTextChanged1( const QString & text ) } } -void ConditionalWidget::slotTextChanged2( const QString & text ) +void ConditionalWidget::slotTextChanged2( const TQString & text ) { if ( text == i18n( "<none>" ) ) { @@ -248,7 +248,7 @@ void ConditionalWidget::slotTextChanged2( const QString & text ) } } -void ConditionalWidget::slotTextChanged3( const QString & text ) +void ConditionalWidget::slotTextChanged3( const TQString & text ) { if ( text == i18n( "<none>" ) ) { @@ -276,22 +276,22 @@ void ConditionalWidget::slotTextChanged3( const QString & text ) * ConditionalDialog * Sets conditional cell formattings. */ -ConditionalDialog::ConditionalDialog( View * parent, const char * name, - const QRect & marker ) - : KDialogBase( parent, name, true, "", KDialogBase::Ok | KDialogBase::Cancel, +ConditionalDialog::ConditionalDialog( View * tqparent, const char * name, + const TQRect & marker ) + : KDialogBase( tqparent, name, true, "", KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, false ), - m_view( parent ), + m_view( tqparent ), m_dlg( new ConditionalWidget( this ) ), m_marker( marker ) { - QStringList list( m_view->doc()->styleManager()->styleNames() ); + TQStringList list( m_view->doc()->styleManager()->styleNames() ); m_dlg->m_style_1->insertStringList( list ); m_dlg->m_style_2->insertStringList( list ); m_dlg->m_style_3->insertStringList( list ); setCaption( i18n( "Conditional Cell Attributes" ) ); - setButtonBoxOrientation( Vertical ); + setButtonBoxOrientation(Qt::Vertical ); setMainWidget( m_dlg ); init(); @@ -299,13 +299,13 @@ ConditionalDialog::ConditionalDialog( View * parent, const char * name, void ConditionalDialog::init() { - QValueList<Conditional> conditionList; - QValueList<Conditional> otherList; + TQValueList<Conditional> conditionList; + TQValueList<Conditional> otherList; bool found; int numCondition; - QValueList<Conditional>::iterator it1; - QValueList<Conditional>::iterator it2; + TQValueList<Conditional>::iterator it1; + TQValueList<Conditional>::iterator it2; Cell * obj = m_view->activeSheet()->cellAt( m_marker.left(), m_marker.top() ); @@ -415,11 +415,11 @@ void ConditionalDialog::init() void ConditionalDialog::init( Conditional const & tmp, int numCondition ) { kdDebug() << "Adding " << numCondition << endl; - QComboBox * cb = 0; - QComboBox * sb = 0; + TQComboBox * cb = 0; + TQComboBox * sb = 0; KLineEdit * kl1 = 0; KLineEdit * kl2 = 0; - QString value; + TQString value; switch( numCondition ) { @@ -517,7 +517,7 @@ void ConditionalDialog::init( Conditional const & tmp, int numCondition ) } } -Conditional::Type ConditionalDialog::typeOfCondition( QComboBox const * const cb ) const +Conditional::Type ConditionalDialog::typeOfCondition( TQComboBox const * const cb ) const { Conditional::Type result = Conditional::None; switch( cb->currentItem() ) @@ -593,9 +593,9 @@ bool ConditionalDialog::checkInputData() return true; } -bool ConditionalDialog::getCondition( Conditional & newCondition, const QComboBox * cb, +bool ConditionalDialog::getCondition( Conditional & newCondition, const TQComboBox * cb, const KLineEdit * edit1, const KLineEdit * edit2, - const QComboBox * sb, Style * style ) + const TQComboBox * sb, Style * style ) { if ( !cb->isEnabled() ) return false; @@ -607,9 +607,9 @@ bool ConditionalDialog::getCondition( Conditional & newCondition, const QComboBo bool ok = false; double d1 = edit1->text().toDouble( &ok ); double d2 = 0.0; - QString * s1 = 0; - QString * s2 = 0; - QString * sn = 0; + TQString * s1 = 0; + TQString * s2 = 0; + TQString * sn = 0; if ( ok ) { @@ -620,12 +620,12 @@ bool ConditionalDialog::getCondition( Conditional & newCondition, const QComboBo else { d1 = 0.0; - s1 = new QString( edit1->text() ); + s1 = new TQString( edit1->text() ); if ( edit2->isEnabled() ) - s2 = new QString( edit2->text() ); + s2 = new TQString( edit2->text() ); } - sn = new QString( sb->currentText() ); + sn = new TQString( sb->currentText() ); newCondition.val1 = d1; newCondition.val2 = d2; @@ -651,7 +651,7 @@ void ConditionalDialog::slotOk() m_view->doc()->emitBeginOperation( false ); StyleManager * manager = m_view->doc()->styleManager(); - QValueList<Conditional> newList; + TQValueList<Conditional> newList; Conditional newCondition; diff --git a/kspread/dialogs/kspread_dlg_conditional.h b/kspread/dialogs/kspread_dlg_conditional.h index 4b0e065c3..9ecba7be8 100644 --- a/kspread/dialogs/kspread_dlg_conditional.h +++ b/kspread/dialogs/kspread_dlg_conditional.h @@ -24,11 +24,11 @@ #define __kspread_dlg_conditional__ #include <kdialogbase.h> -#include <qwidget.h> +#include <tqwidget.h> #include "kspread_condition.h" -class QComboBox; +class TQComboBox; class KLineEdit; namespace KSpread @@ -36,42 +36,44 @@ namespace KSpread class Style; class View; -class ConditionalWidget : public QWidget +class ConditionalWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ConditionalWidget( QWidget * parent = 0, const char * name = 0, WFlags fl = 0 ); + ConditionalWidget( TQWidget * tqparent = 0, const char * name = 0, WFlags fl = 0 ); ~ConditionalWidget(); - QComboBox * m_condition_1; - QComboBox * m_style_1; + TQComboBox * m_condition_1; + TQComboBox * m_style_1; KLineEdit * m_firstValue_1; KLineEdit * m_secondValue_1; - QComboBox * m_condition_2; - QComboBox * m_style_2; + TQComboBox * m_condition_2; + TQComboBox * m_style_2; KLineEdit * m_firstValue_2; KLineEdit * m_secondValue_2; - QComboBox * m_condition_3; - QComboBox * m_style_3; + TQComboBox * m_condition_3; + TQComboBox * m_style_3; KLineEdit * m_firstValue_3; KLineEdit * m_secondValue_3; public slots: - void slotTextChanged1( const QString & ); - void slotTextChanged2( const QString & ); - void slotTextChanged3( const QString & ); + void slotTextChanged1( const TQString & ); + void slotTextChanged2( const TQString & ); + void slotTextChanged3( const TQString & ); }; class ConditionalDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ConditionalDialog( View * parent, const char * name, - const QRect & marker ); + ConditionalDialog( View * tqparent, const char * name, + const TQRect & marker ); void init(); @@ -81,19 +83,19 @@ class ConditionalDialog : public KDialogBase protected: View * m_view; ConditionalWidget * m_dlg; - QRect m_marker; + TQRect m_marker; Conditional::Type m_result; private: void init( Conditional const & tmp, int numCondition ); - Conditional::Type typeOfCondition( QComboBox const * const cb ) const; + Conditional::Type typeOfCondition( TQComboBox const * const cb ) const; bool checkInputData( KLineEdit const * const edit1, KLineEdit const * const edit2 ); bool checkInputData(); - bool getCondition( Conditional & newCondition, const QComboBox * cb, + bool getCondition( Conditional & newCondition, const TQComboBox * cb, const KLineEdit * edit1, const KLineEdit * edit2, - const QComboBox * sb, Style * style ); + const TQComboBox * sb, Style * style ); }; diff --git a/kspread/dialogs/kspread_dlg_cons.cc b/kspread/dialogs/kspread_dlg_cons.cc index 7f10e610d..ca049ee1c 100644 --- a/kspread/dialogs/kspread_dlg_cons.cc +++ b/kspread/dialogs/kspread_dlg_cons.cc @@ -28,11 +28,11 @@ #include <assert.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> #include <kdebug.h> #include <kdialogbase.h> @@ -54,24 +54,24 @@ using namespace KSpread; -ConsolidateDialog::ConsolidateDialog( View* parent, const char* name ) - : KDialogBase( parent, name, false, i18n("Consolidate"), Ok|Cancel ) +ConsolidateDialog::ConsolidateDialog( View* tqparent, const char* name ) + : KDialogBase( tqparent, name, false, i18n("Consolidate"), Ok|Cancel ) { - m_pView = parent; + m_pView = tqparent; - QWidget* page = new QWidget( this ); + TQWidget* page = new TQWidget( this ); setMainWidget( page ); - QGridLayout *grid1 = new QGridLayout( page, 12, 2, marginHint(), spacingHint() ); + TQGridLayout *grid1 = new TQGridLayout( page, 12, 2, marginHint(), spacingHint() ); - QLabel* tmpQLabel; - tmpQLabel = new QLabel( page, "Label_1" ); - grid1->addWidget(tmpQLabel,0,0); - tmpQLabel->setText( i18n("&Function:") ); + TQLabel* tmpTQLabel; + tmpTQLabel = new TQLabel( page, "Label_1" ); + grid1->addWidget(tmpTQLabel,0,0); + tmpTQLabel->setText( i18n("&Function:") ); - m_pFunction = new QComboBox( page ); + m_pFunction = new TQComboBox( page ); grid1->addWidget(m_pFunction,1,0); - tmpQLabel->setBuddy(m_pFunction); + tmpTQLabel->setBuddy(m_pFunction); m_pFunction->insertItem( i18n("Sum"), Sum ); m_pFunction->insertItem( i18n("Average"), Average ); @@ -82,41 +82,41 @@ ConsolidateDialog::ConsolidateDialog( View* parent, const char* name ) m_pFunction->insertItem( i18n("Standard Deviation"), StdDev ); m_pFunction->insertItem( i18n("Variance"), Var ); - tmpQLabel = new QLabel( page, "Label_1" ); - tmpQLabel->setText( i18n("Re&ference:") ); - grid1->addWidget(tmpQLabel,2,0); + tmpTQLabel = new TQLabel( page, "Label_1" ); + tmpTQLabel->setText( i18n("Re&ference:") ); + grid1->addWidget(tmpTQLabel,2,0); - m_pRef = new QLineEdit( page ); + m_pRef = new TQLineEdit( page ); grid1->addWidget(m_pRef,3,0); - tmpQLabel->setBuddy(m_pRef); + tmpTQLabel->setBuddy(m_pRef); - tmpQLabel = new QLabel( page, "Label_1" ); - grid1->addWidget(tmpQLabel,4,0); - tmpQLabel->setText( i18n("&Entered references:") ); + tmpTQLabel = new TQLabel( page, "Label_1" ); + grid1->addWidget(tmpTQLabel,4,0); + tmpTQLabel->setText( i18n("&Entered references:") ); - m_pRefs = new QListBox( page ); + m_pRefs = new TQListBox( page ); grid1->addMultiCellWidget( m_pRefs,5,8,0,0); - tmpQLabel->setBuddy(m_pRefs); + tmpTQLabel->setBuddy(m_pRefs); - m_pRow = new QCheckBox( i18n("&Description in row"), page ); + m_pRow = new TQCheckBox( i18n("&Description in row"), page ); grid1->addWidget( m_pRow,9,0); - m_pCol = new QCheckBox( i18n("De&scription in column"), page ); + m_pCol = new TQCheckBox( i18n("De&scription in column"), page ); grid1->addWidget(m_pCol,10,0); - m_pCopy = new QCheckBox( i18n("Co&py data"), page ); + m_pCopy = new TQCheckBox( i18n("Co&py data"), page ); grid1->addWidget(m_pCopy,11,0); - m_pAdd = new QPushButton( i18n("&Add"), page ); + m_pAdd = new TQPushButton( i18n("&Add"), page ); grid1->addWidget(m_pAdd,2,1); - m_pRemove = new QPushButton( i18n("&Remove"), page ); + m_pRemove = new TQPushButton( i18n("&Remove"), page ); grid1->addWidget(m_pRemove,3,1); - connect( m_pAdd, SIGNAL( clicked() ), this, SLOT( slotAdd() ) ); - connect( m_pRemove, SIGNAL( clicked() ), this, SLOT( slotRemove() ) ); - connect( m_pRef, SIGNAL( returnPressed() ), this, SLOT( slotReturnPressed() ) ); + connect( m_pAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdd() ) ); + connect( m_pRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemove() ) ); + connect( m_pRef, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotReturnPressed() ) ); - connect(m_pView->selectionInfo(), SIGNAL(changed(const Region&)), - this, SLOT(slotSelectionChanged())); + connect(m_pView->selectionInfo(), TQT_SIGNAL(changed(const Region&)), + this, TQT_SLOT(slotSelectionChanged())); } ConsolidateDialog::~ConsolidateDialog() @@ -128,10 +128,10 @@ enum Description { D_ROW, D_COL, D_NONE, D_BOTH }; struct st_cell { - QString xdesc; - QString ydesc; + TQString xdesc; + TQString ydesc; Cell* cell; - QString sheet; + TQString sheet; int x; int y; }; @@ -146,7 +146,7 @@ void ConsolidateDialog::slotOk() int dx = m_pView->selectionInfo()->selection().left(); int dy = m_pView->selectionInfo()->selection().top(); - QString function; + TQString function; switch( m_pFunction->currentItem() ) { @@ -161,9 +161,9 @@ void ConsolidateDialog::slotOk() default: break; // bad bad ! } - QStringList r = refs(); - QValueList<Range> ranges; - QStringList::Iterator s = r.begin(); + TQStringList r = refs(); + TQValueList<Range> ranges; + TQStringList::Iterator s = r.begin(); for( ; s != r.end(); ++s ) { Range r( *s, map ); @@ -190,21 +190,21 @@ void ConsolidateDialog::slotOk() // Check whether all ranges have same size Q_ASSERT( ranges.count() > 0 ); - QValueList<Range>::Iterator it = ranges.begin(); + TQValueList<Range>::Iterator it = ranges.begin(); int w = (*it).range().right() - (*it).range().left() + 1; int h = (*it).range().bottom() - (*it).range().top() + 1; if ( w <= ( ( desc == D_BOTH || desc == D_COL ) ? 1 : 0 ) || h <= ( ( desc == D_BOTH || desc == D_ROW ) ? 1 : 0 ) ) { m_pView->slotUpdateView( m_pView->activeSheet() ); - KMessageBox::error( this, i18n( "The range\n%1\nis too small" ).arg( *( r.begin() ) )); + KMessageBox::error( this, i18n( "The range\n%1\nis too small" ).tqarg( *( r.begin() ) )); return; } if( (*it).range().bottom()==KS_rowMax || (*it).range().right()== KS_colMax ) { m_pView->slotUpdateView( m_pView->activeSheet() ); - KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).arg( *( r.begin() ) )); + KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).tqarg( *( r.begin() ) )); return; } @@ -212,7 +212,7 @@ void ConsolidateDialog::slotOk() int i = 1; for( ; it != ranges.end(); ++it, i++ ) { - QRect currentRange=(*it).range(); + TQRect currentRange=(*it).range(); int w2 = currentRange.right() - currentRange.left() + 1; int h2 = currentRange.bottom() - currentRange.top() + 1; @@ -220,7 +220,7 @@ void ConsolidateDialog::slotOk() if(currentRange.bottom()==KS_rowMax || currentRange.right()== KS_colMax) { m_pView->slotUpdateView( m_pView->activeSheet() ); - KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).arg( r[i])); + KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).tqarg( r[i])); return; } if ( ( desc == D_NONE && ( w != w2 || h != h2 ) ) || @@ -228,7 +228,7 @@ void ConsolidateDialog::slotOk() ( desc == D_COL && w != w2 ) ) { m_pView->slotUpdateView( m_pView->activeSheet() ); - QString tmp = i18n( "The ranges\n%1\nand\n%2\nhave different size").arg( *( r.begin() ) ).arg( r[i] ); + TQString tmp = i18n( "The ranges\n%1\nand\n%2\nhave different size").tqarg( *( r.begin() ) ).tqarg( r[i] ); KMessageBox::error( this, tmp); return; } @@ -238,22 +238,22 @@ void ConsolidateDialog::slotOk() if ( desc == D_NONE ) { // Check whether the destination is part of the source ... - QRect dest; + TQRect dest; dest.setCoords( dx, dy, dx + w - 1, dy + h - 1 ); it = ranges.begin(); for( ; it != ranges.end(); ++it ) { Sheet *t = (*it).sheet(); Q_ASSERT( t ); - QRect r; + TQRect r; - QRect currentRange=(*it).range(); + TQRect currentRange=(*it).range(); r.setCoords( currentRange.left(), currentRange.top(), currentRange.right(), currentRange.bottom() ); if ( t == sheet && r.intersects( dest ) ) { m_pView->slotUpdateView( m_pView->activeSheet() ); - QString tmp( i18n("The source tables intersect with the destination table") ); + TQString tmp( i18n("The source tables intersect with the destination table") ); KMessageBox::error( this, tmp); return; } @@ -264,7 +264,7 @@ void ConsolidateDialog::slotOk() for( int y = 0; y < h; y++ ) { bool novalue=true; - QString formula = "=" + function + "("; + TQString formula = "=" + function + "("; it = ranges.begin(); for( ; it != ranges.end(); ++it ) { @@ -289,7 +289,7 @@ void ConsolidateDialog::slotOk() else if ( desc == D_ROW ) { // Get list of all descriptions in the rows - QStringList lst; + TQStringList lst; it = ranges.begin(); for( ; it != ranges.end(); ++it ) { @@ -301,8 +301,8 @@ void ConsolidateDialog::slotOk() Cell *c = t->cellAt( x, (*it).range().top() ); if ( c ) { - QString s = c->value().asString(); - if ( !lst.contains( s ) ) + TQString s = c->value().asString(); + if ( !lst.tqcontains( s ) ) lst.append( s ); } } @@ -310,20 +310,20 @@ void ConsolidateDialog::slotOk() lst.sort(); // Check whether the destination is part of the source ... - QRect dest; + TQRect dest; dest.setCoords( dx, dy, dx + lst.count() - 1, dy + h - 1 ); it = ranges.begin(); for( ; it != ranges.end(); ++it ) { Sheet *t = (*it).sheet(); assert( t ); - QRect r; - QRect currentRange=(*it).range(); + TQRect r; + TQRect currentRange=(*it).range(); r.setCoords( currentRange.left(), currentRange.top(), currentRange.right(), currentRange.bottom() ); if ( t == sheet && r.intersects( dest ) ) { m_pView->slotUpdateView( m_pView->activeSheet() ); - QString tmp( i18n("The source tables intersect with the destination table") ); + TQString tmp( i18n("The source tables intersect with the destination table") ); KMessageBox::error( this, tmp); return; } @@ -331,7 +331,7 @@ void ConsolidateDialog::slotOk() // Now create the consolidation sheet int x = 0; - QStringList::Iterator s = lst.begin(); + TQStringList::Iterator s = lst.begin(); for( ; s != lst.end(); ++s, ++x ) { sheet->setText( dy, dx + x, *s ); @@ -339,7 +339,7 @@ void ConsolidateDialog::slotOk() for( int y = 1; y < h; ++y ) { int count = 0; - QString formula = "=" + function + "("; + TQString formula = "=" + function + "("; it = ranges.begin(); for( ; it != ranges.end(); ++it ) { @@ -372,7 +372,7 @@ void ConsolidateDialog::slotOk() else if ( desc == D_COL ) { // Get list of all descriptions in the columns - QStringList lst; + TQStringList lst; it = ranges.begin(); for( ; it != ranges.end(); ++it ) { @@ -383,8 +383,8 @@ void ConsolidateDialog::slotOk() Cell *c = t->cellAt( (*it).range().left(), y ); if ( c ) { - QString s = c->value().asString(); - if ( !s.isEmpty() && lst.find( s ) == lst.end() ) + TQString s = c->value().asString(); + if ( !s.isEmpty() && lst.tqfind( s ) == lst.end() ) lst.append( s ); } } @@ -392,20 +392,20 @@ void ConsolidateDialog::slotOk() lst.sort(); // Check whether the destination is part of the source ... - QRect dest; + TQRect dest; dest.setCoords( dx, dy, dx + w - 1, dy + lst.count() - 1 ); it = ranges.begin(); for( ; it != ranges.end(); ++it ) { Sheet *t = (*it).sheet(); assert( t ); - QRect r; - QRect currentRange=(*it).range(); + TQRect r; + TQRect currentRange=(*it).range(); r.setCoords( currentRange.left(), currentRange.top(), currentRange.right(), currentRange.bottom() ); if ( t == sheet && r.intersects( dest ) ) { m_pView->slotUpdateView( m_pView->activeSheet() ); - QString tmp( i18n("The source tables intersect with the destination table") ); + TQString tmp( i18n("The source tables intersect with the destination table") ); KMessageBox::error( this, tmp); return; } @@ -413,7 +413,7 @@ void ConsolidateDialog::slotOk() // Now create the consolidation sheet int y = 0; - QStringList::Iterator s = lst.begin(); + TQStringList::Iterator s = lst.begin(); for( ; s != lst.end(); ++s, ++y ) { sheet->setText( dy + y, dx, *s ); @@ -421,7 +421,7 @@ void ConsolidateDialog::slotOk() for( int x = 1; x < w; ++x ) { int count = 0; - QString formula = "=" + function + "("; + TQString formula = "=" + function + "("; it = ranges.begin(); for( ; it != ranges.end(); ++it ) { @@ -432,7 +432,7 @@ void ConsolidateDialog::slotOk() Cell *c = t->cellAt( (*it).range().left(), i ); if ( c ) { - QString v = c->value().asString(); + TQString v = c->value().asString(); if ( !v.isEmpty() && *s == v ) { // Cell *c2 = t->cellAt( x + (*it).range.left(), i ); @@ -455,7 +455,7 @@ void ConsolidateDialog::slotOk() else if ( desc == D_BOTH ) { // Get list of all descriptions in the columns - QStringList cols; + TQStringList cols; it = ranges.begin(); for( ; it != ranges.end(); ++it ) { @@ -466,8 +466,8 @@ void ConsolidateDialog::slotOk() Cell *c = t->cellAt( (*it).range().left(), y ); if ( c ) { - QString s = c->value().asString(); - if ( !s.isEmpty() && cols.find( s ) == cols.end() ) + TQString s = c->value().asString(); + if ( !s.isEmpty() && cols.tqfind( s ) == cols.end() ) cols.append( s ); } } @@ -475,7 +475,7 @@ void ConsolidateDialog::slotOk() cols.sort(); // Get list of all descriptions in the rows - QStringList rows; + TQStringList rows; it = ranges.begin(); for( ; it != ranges.end(); ++it ) { @@ -486,8 +486,8 @@ void ConsolidateDialog::slotOk() Cell *c = t->cellAt( x, (*it).range().top() ); if ( c ) { - QString s = c->value().asString(); - if ( !s.isEmpty() && rows.find( s ) == rows.end() ) + TQString s = c->value().asString(); + if ( !s.isEmpty() && rows.tqfind( s ) == rows.end() ) rows.append( s ); } } @@ -495,27 +495,27 @@ void ConsolidateDialog::slotOk() rows.sort(); // Check whether the destination is part of the source ... - QRect dest; + TQRect dest; dest.setCoords( dx, dy, dx + cols.count(), dy + rows.count() ); it = ranges.begin(); for( ; it != ranges.end(); ++it ) { Sheet *t = (*it).sheet(); assert( t ); - QRect r; - QRect currentRange=(*it).range(); + TQRect r; + TQRect currentRange=(*it).range(); r.setCoords( currentRange.left(), currentRange.top(), currentRange.right(), currentRange.bottom() ); if ( t == sheet && r.intersects( dest ) ) { m_pView->slotUpdateView( m_pView->activeSheet() ); - QString tmp( i18n("The source tables intersect with the destination table") ); + TQString tmp( i18n("The source tables intersect with the destination table") ); KMessageBox::error( this, tmp); return; } } // Fill the list with all interesting cells - QValueList<st_cell> lst; + TQValueList<st_cell> lst; it = ranges.begin(); for( ; it != ranges.end(); ++it ) { @@ -526,13 +526,13 @@ void ConsolidateDialog::slotOk() Cell *c = t->cellAt( x, (*it).range().top() ); if ( c ) { - QString ydesc = c->value().asString(); + TQString ydesc = c->value().asString(); for( int y = (*it).range().top() + 1; y <= (*it).range().bottom() ; ++y ) { Cell *c2 = t->cellAt( (*it).range().left(), y ); if ( c2 ) { - QString xdesc = c2->value().asString(); + TQString xdesc = c2->value().asString(); Cell *c3 = t->cellAt( x, y ); if ( c3 && c3->value().isNumber() ) { @@ -553,7 +553,7 @@ void ConsolidateDialog::slotOk() // Draw the row description int i = 1; - QStringList::Iterator s = rows.begin(); + TQStringList::Iterator s = rows.begin(); for( ; s != rows.end(); ++s, ++i ) sheet->setText( dy, dx + i, *s ); @@ -565,16 +565,16 @@ void ConsolidateDialog::slotOk() // Draw the data int x = 1; - QStringList::Iterator ydesc = rows.begin(); + TQStringList::Iterator ydesc = rows.begin(); for( ; ydesc != rows.end(); ++ydesc, x++ ) { int y = 1; - QStringList::Iterator xdesc = cols.begin(); + TQStringList::Iterator xdesc = cols.begin(); for( ; xdesc != cols.end(); ++xdesc, y++ ) { int count = 0; - QString formula = "=" + function + "("; - QValueList<st_cell>::Iterator lit = lst.begin(); + TQString formula = "=" + function + "("; + TQValueList<st_cell>::Iterator lit = lst.begin(); for( ; lit != lst.end(); ++lit ) { if ( (*lit).xdesc == *xdesc && (*lit).ydesc == *ydesc ) @@ -621,9 +621,9 @@ void ConsolidateDialog::slotRemove() actionButton( Ok )->setEnabled( false ); } -QStringList ConsolidateDialog::refs() +TQStringList ConsolidateDialog::refs() { - QStringList list; + TQStringList list; int c = m_pRefs->count(); for( int i = 0; i < c; i++ ) @@ -640,19 +640,19 @@ void ConsolidateDialog::slotSelectionChanged() return; } - QString area = m_pView->selectionInfo()->name(); + TQString area = m_pView->selectionInfo()->name(); m_pRef->setText( area ); m_pRef->setSelection( 0, area.length() ); } void ConsolidateDialog::slotReturnPressed() { - QString txt = m_pRef->text(); + TQString txt = m_pRef->text(); Range r( txt, m_pView->doc()->map() ); if ( !r.isValid() ) { - KMessageBox::error( this, i18n("The range\n%1\n is malformed").arg( txt )); + KMessageBox::error( this, i18n("The range\n%1\n is malformed").tqarg( txt )); return; } @@ -663,14 +663,14 @@ void ConsolidateDialog::slotReturnPressed() } } -void ConsolidateDialog::closeEvent ( QCloseEvent * ) +void ConsolidateDialog::closeEvent ( TQCloseEvent * ) { delete this; } -QString ConsolidateDialog::evaluate( const QString& formula, Sheet* sheet ) +TQString ConsolidateDialog::evaluate( const TQString& formula, Sheet* sheet ) { - QString result = "###"; + TQString result = "###"; Formula *f = new Formula (sheet); f->setExpression (formula); if (!f->isValid()) { diff --git a/kspread/dialogs/kspread_dlg_cons.h b/kspread/dialogs/kspread_dlg_cons.h index d45e0fb81..b845f00f1 100644 --- a/kspread/dialogs/kspread_dlg_cons.h +++ b/kspread/dialogs/kspread_dlg_cons.h @@ -29,14 +29,14 @@ #ifndef __kspread_dlg_cons__ #define __kspread_dlg_cons__ -#include <qstringlist.h> +#include <tqstringlist.h> #include <kdialogbase.h> -class QLineEdit; -class QPushButton; -class QComboBox; -class QCheckBox; -class QListBox; +class TQLineEdit; +class TQPushButton; +class TQComboBox; +class TQCheckBox; +class TQListBox; namespace KSpread { @@ -46,10 +46,11 @@ class View; class ConsolidateDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ConsolidateDialog( View* parent, const char* name ); + ConsolidateDialog( View* tqparent, const char* name ); ~ConsolidateDialog(); - QStringList refs(); + TQStringList refs(); public slots: virtual void slotOk(); @@ -61,19 +62,19 @@ public slots: void slotReturnPressed(); protected: - virtual void closeEvent ( QCloseEvent * ); + virtual void closeEvent ( TQCloseEvent * ); View* m_pView; - QLineEdit* m_pRef; - QListBox* m_pRefs; - QComboBox* m_pFunction; - QPushButton* m_pAdd; - QPushButton* m_pRemove; - QCheckBox* m_pRow; - QCheckBox* m_pCol; - QCheckBox* m_pCopy; - - QString evaluate( const QString& formula, Sheet* sheet ); + TQLineEdit* m_pRef; + TQListBox* m_pRefs; + TQComboBox* m_pFunction; + TQPushButton* m_pAdd; + TQPushButton* m_pRemove; + TQCheckBox* m_pRow; + TQCheckBox* m_pCol; + TQCheckBox* m_pCopy; + + TQString evaluate( const TQString& formula, Sheet* sheet ); enum { Sum = 0, Average, Count, Max, Min, Product, StdDev, Var }; }; diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc index 3c103b8e6..ed1bf44f7 100644 --- a/kspread/dialogs/kspread_dlg_csv.cc +++ b/kspread/dialogs/kspread_dlg_csv.cc @@ -20,17 +20,17 @@ * Boston, MA 02110-1301, USA. */ -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qclipboard.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qmime.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qtable.h> -#include <qlayout.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqclipboard.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqmime.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqtable.h> +#include <tqlayout.h> #include <kapplication.h> #include <kdebug.h> @@ -49,9 +49,9 @@ using namespace KSpread; -CSVDialog::CSVDialog( View * parent, const char * name, QRect const & rect, Mode mode) - : KDialogBase( parent, name, true, QString::null, Ok|Cancel ), - m_pView( parent ), +CSVDialog::CSVDialog( View * tqparent, const char * name, TQRect const & rect, Mode mode) + : KDialogBase( tqparent, name, true, TQString(), Ok|Cancel ), + m_pView( tqparent ), m_cancelled( false ), m_adjustRows( 0 ), m_startline( 0 ), @@ -65,10 +65,10 @@ CSVDialog::CSVDialog( View * parent, const char * name, QRect const & rect, Mode setSizeGripEnabled( TRUE ); - QWidget* page = new QWidget( this ); + TQWidget* page = new TQWidget( this ); setMainWidget( page ); - // MyDialogLayout = new QGridLayout( page, 4, 4, marginHint(), spacingHint(), "MyDialogLayout"); - MyDialogLayout = new QGridLayout( page, 1, 1, 11, 6, "MyDialogLayout"); + // MyDialogLayout = new TQGridLayout( page, 4, 4, marginHint(), spacingHint(), "MyDialogLayout"); + MyDialogLayout = new TQGridLayout( page, 1, 1, 11, 6, "MyDialogLayout"); // Limit the range int column = m_targetRect.left(); @@ -77,108 +77,108 @@ CSVDialog::CSVDialog( View * parent, const char * name, QRect const & rect, Mode if( m_targetRect.bottom() > lastCell->row() ) m_targetRect.setBottom( lastCell->row() ); - m_sheet = new QTable( page, "m_table" ); - //m_sheet->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, m_sheet->sizePolicy().hasHeightForWidth() ) ); + m_sheet = new TQTable( page, "m_table" ); + //m_sheet->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, m_sheet->sizePolicy().hasHeightForWidth() ) ); m_sheet->setNumRows( 0 ); m_sheet->setNumCols( 0 ); MyDialogLayout->addMultiCellWidget( m_sheet, 3, 3, 0, 3 ); // Delimiter: comma, semicolon, tab, space, other - m_delimiterBox = new QButtonGroup( page, "m_delimiterBox" ); - m_delimiterBox->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) ); + m_delimiterBox = new TQButtonGroup( page, "m_delimiterBox" ); + m_delimiterBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) ); m_delimiterBox->setTitle( i18n( "Delimiter" ) ); m_delimiterBox->setColumnLayout(0, Qt::Vertical ); - m_delimiterBox->layout()->setSpacing( KDialog::spacingHint() ); - m_delimiterBox->layout()->setMargin( KDialog::marginHint() ); - m_delimiterBoxLayout = new QGridLayout( m_delimiterBox->layout() ); - m_delimiterBoxLayout->setAlignment( Qt::AlignTop ); + m_delimiterBox->tqlayout()->setSpacing( KDialog::spacingHint() ); + m_delimiterBox->tqlayout()->setMargin( KDialog::marginHint() ); + m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->tqlayout() ); + m_delimiterBoxLayout->tqsetAlignment( TQt::AlignTop ); MyDialogLayout->addMultiCellWidget( m_delimiterBox, 0, 2, 0, 0 ); - m_ignoreDuplicates = new QCheckBox( page, "m_ignoreDuplicates" ); + m_ignoreDuplicates = new TQCheckBox( page, "m_ignoreDuplicates" ); m_ignoreDuplicates->setText( i18n( "Ignore duplicate delimiters" ) ); MyDialogLayout->addMultiCellWidget( m_ignoreDuplicates, 2, 2, 2, 3 ); - m_radioComma = new QRadioButton( m_delimiterBox, "m_radioComma" ); + m_radioComma = new TQRadioButton( m_delimiterBox, "m_radioComma" ); m_radioComma->setText( i18n( "Comma" ) ); m_radioComma->setChecked( TRUE ); m_delimiterBoxLayout->addWidget( m_radioComma, 0, 0 ); - m_radioSemicolon = new QRadioButton( m_delimiterBox, "m_radioSemicolon" ); + m_radioSemicolon = new TQRadioButton( m_delimiterBox, "m_radioSemicolon" ); m_radioSemicolon->setText( i18n( "Semicolon" ) ); m_delimiterBoxLayout->addWidget( m_radioSemicolon, 0, 1 ); - m_radioTab = new QRadioButton( m_delimiterBox, "m_radioTab" ); + m_radioTab = new TQRadioButton( m_delimiterBox, "m_radioTab" ); m_radioTab->setText( i18n( "Tabulator" ) ); m_delimiterBoxLayout->addWidget( m_radioTab, 1, 0 ); - m_radioSpace = new QRadioButton( m_delimiterBox, "m_radioSpace" ); + m_radioSpace = new TQRadioButton( m_delimiterBox, "m_radioSpace" ); m_radioSpace->setText( i18n( "Space" ) ); m_delimiterBoxLayout->addWidget( m_radioSpace, 1, 1 ); - m_radioOther = new QRadioButton( m_delimiterBox, "m_radioOther" ); + m_radioOther = new TQRadioButton( m_delimiterBox, "m_radioOther" ); m_radioOther->setText( i18n( "Other" ) ); m_delimiterBoxLayout->addWidget( m_radioOther, 0, 2 ); - m_delimiterEdit = new QLineEdit( m_delimiterBox, "m_delimiterEdit" ); - m_delimiterEdit->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) ); - m_delimiterEdit->setMaximumSize( QSize( 30, 32767 ) ); + m_delimiterEdit = new TQLineEdit( m_delimiterBox, "m_delimiterEdit" ); + m_delimiterEdit->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) ); + m_delimiterEdit->setMaximumSize( TQSize( 30, 32767 ) ); m_delimiterBoxLayout->addWidget( m_delimiterEdit, 1, 2 ); // Format: number, text, currency, - m_formatBox = new QButtonGroup( page, "m_formatBox" ); - m_formatBox->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) ); + m_formatBox = new TQButtonGroup( page, "m_formatBox" ); + m_formatBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) ); m_formatBox->setTitle( i18n( "Format" ) ); m_formatBox->setColumnLayout(0, Qt::Vertical ); - m_formatBox->layout()->setSpacing( KDialog::spacingHint() ); - m_formatBox->layout()->setMargin( KDialog::marginHint() ); - m_formatBoxLayout = new QGridLayout( m_formatBox->layout() ); - m_formatBoxLayout->setAlignment( Qt::AlignTop ); + m_formatBox->tqlayout()->setSpacing( KDialog::spacingHint() ); + m_formatBox->tqlayout()->setMargin( KDialog::marginHint() ); + m_formatBoxLayout = new TQGridLayout( m_formatBox->tqlayout() ); + m_formatBoxLayout->tqsetAlignment( TQt::AlignTop ); MyDialogLayout->addMultiCellWidget( m_formatBox, 0, 2, 1, 1 ); - m_radioNumber = new QRadioButton( m_formatBox, "m_radioNumber" ); + m_radioNumber = new TQRadioButton( m_formatBox, "m_radioNumber" ); m_radioNumber->setText( i18n( "Number" ) ); m_formatBoxLayout->addMultiCellWidget( m_radioNumber, 1, 1, 0, 1 ); - m_radioText = new QRadioButton( m_formatBox, "m_radioText" ); + m_radioText = new TQRadioButton( m_formatBox, "m_radioText" ); m_radioText->setText( i18n( "Text" ) ); m_radioText->setChecked( TRUE ); m_formatBoxLayout->addWidget( m_radioText, 0, 0 ); - m_radioCurrency = new QRadioButton( m_formatBox, "m_radioCurrency" ); + m_radioCurrency = new TQRadioButton( m_formatBox, "m_radioCurrency" ); m_radioCurrency->setText( i18n( "Currency" ) ); m_formatBoxLayout->addMultiCellWidget( m_radioCurrency, 0, 0, 1, 2 ); - m_radioDate = new QRadioButton( m_formatBox, "m_radioDate" ); + m_radioDate = new TQRadioButton( m_formatBox, "m_radioDate" ); m_radioDate->setText( i18n( "Date" ) ); m_formatBoxLayout->addWidget( m_radioDate, 1, 2 ); - m_comboLine = new QComboBox( FALSE, page, "m_comboLine" ); + m_comboLine = new TQComboBox( FALSE, page, "m_comboLine" ); m_comboLine->insertItem( i18n( "1" ) ); - m_comboLine->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) ); + m_comboLine->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) ); MyDialogLayout->addWidget( m_comboLine, 1, 3 ); - m_comboQuote = new QComboBox( FALSE, page, "m_comboQuote" ); + m_comboQuote = new TQComboBox( FALSE, page, "m_comboQuote" ); m_comboQuote->insertItem( i18n( "\"" ) ); m_comboQuote->insertItem( i18n( "'" ) ); m_comboQuote->insertItem( i18n( "None" ) ); - m_comboQuote->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, m_comboQuote->sizePolicy().hasHeightForWidth() ) ); + m_comboQuote->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboQuote->sizePolicy().hasHeightForWidth() ) ); MyDialogLayout->addWidget( m_comboQuote, 1, 2 ); - QSpacerItem* spacer_2 = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Preferred ); + TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Preferred ); MyDialogLayout->addItem( spacer_2, 2, 3 ); - TextLabel3 = new QLabel( page, "TextLabel3" ); - TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) ); + TextLabel3 = new TQLabel( page, "TextLabel3" ); + TextLabel3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) ); TextLabel3->setText( i18n( "Start at line:" ) ); MyDialogLayout->addWidget( TextLabel3, 0, 3 ); - TextLabel2 = new QLabel( page, "TextLabel2" ); - TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) ); + TextLabel2 = new TQLabel( page, "TextLabel2" ); + TextLabel2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) ); TextLabel2->setText( i18n( "Textquote:" ) ); MyDialogLayout->addWidget( TextLabel2, 0, 2 ); @@ -186,7 +186,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, QRect const & rect, Mode if ( m_mode == Clipboard ) { setCaption( i18n( "Inserting From Clipboard" ) ); - QMimeSource * mime = QApplication::clipboard()->data(); + TQMimeSource * mime = TQApplication::tqclipboard()->data(); if ( !mime ) { KMessageBox::information( this, i18n("There is no data in the clipboard.") ); @@ -200,12 +200,12 @@ CSVDialog::CSVDialog( View * parent, const char * name, QRect const & rect, Mode m_cancelled = true; return; } - m_fileArray = QByteArray(mime->encodedData( "text/plain" ) ); + m_fileArray = TQByteArray(mime->tqencodedData( "text/plain" ) ); } else if ( mode == File ) { setCaption( i18n( "Inserting Text File" ) ); - QString file = KFileDialog::getOpenFileName(":", + TQString file = KFileDialog::getOpenFileName(":", "text/plain", this); //cancel action ! @@ -215,7 +215,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, QRect const & rect, Mode m_cancelled = true; return; } - QFile in(file); + TQFile in(file); if (!in.open(IO_ReadOnly)) { KMessageBox::sorry( this, i18n("Cannot open input file.") ); @@ -224,7 +224,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, QRect const & rect, Mode m_cancelled = true; return; } - m_fileArray = QByteArray(in.size()); + m_fileArray = TQByteArray(in.size()); in.readBlock(m_fileArray.data(), in.size()); in.close(); } @@ -249,31 +249,31 @@ CSVDialog::CSVDialog( View * parent, const char * name, QRect const & rect, Mode fillSheet(); fillComboBox(); - resize(sizeHint()); - - m_sheet->setSelectionMode(QTable::NoSelection); - - connect(m_formatBox, SIGNAL(clicked(int)), - this, SLOT(formatClicked(int))); - connect(m_delimiterBox, SIGNAL(clicked(int)), - this, SLOT(delimiterClicked(int))); - connect(m_delimiterEdit, SIGNAL(returnPressed()), - this, SLOT(returnPressed())); - connect(m_delimiterEdit, SIGNAL(textChanged ( const QString & )), - this, SLOT(textChanged ( const QString & ) )); - connect(m_comboLine, SIGNAL(activated(const QString&)), - this, SLOT(lineSelected(const QString&))); - connect(m_comboQuote, SIGNAL(activated(const QString&)), - this, SLOT(textquoteSelected(const QString&))); - connect(m_sheet, SIGNAL(currentChanged(int, int)), - this, SLOT(currentCellChanged(int, int))); - connect(m_ignoreDuplicates, SIGNAL(stateChanged(int)), - this, SLOT(ignoreDuplicatesChanged(int))); + resize(tqsizeHint()); + + m_sheet->setSelectionMode(TQTable::NoSelection); + + connect(m_formatBox, TQT_SIGNAL(clicked(int)), + this, TQT_SLOT(formatClicked(int))); + connect(m_delimiterBox, TQT_SIGNAL(clicked(int)), + this, TQT_SLOT(delimiterClicked(int))); + connect(m_delimiterEdit, TQT_SIGNAL(returnPressed()), + this, TQT_SLOT(returnPressed())); + connect(m_delimiterEdit, TQT_SIGNAL(textChanged ( const TQString & )), + this, TQT_SLOT(textChanged ( const TQString & ) )); + connect(m_comboLine, TQT_SIGNAL(activated(const TQString&)), + this, TQT_SLOT(lineSelected(const TQString&))); + connect(m_comboQuote, TQT_SIGNAL(activated(const TQString&)), + this, TQT_SLOT(textquoteSelected(const TQString&))); + connect(m_sheet, TQT_SIGNAL(currentChanged(int, int)), + this, TQT_SLOT(currentCellChanged(int, int))); + connect(m_ignoreDuplicates, TQT_SIGNAL(stateChanged(int)), + this, TQT_SLOT(ignoreDuplicatesChanged(int))); } CSVDialog::~CSVDialog() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } bool CSVDialog::cancelled() @@ -286,11 +286,11 @@ void CSVDialog::fillSheet() int row, column; bool lastCharDelimiter = false; bool ignoreDups = m_ignoreDuplicates->isChecked(); - enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD, + enum { S_START, S_TQUOTED_FIELD, S_MAYBE_END_OF_TQUOTED_FIELD, S_END_OF_TQUOTED_FIELD, S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START; - QChar x; - QString field = ""; + TQChar x; + TQString field = ""; for (row = 0; row < m_sheet->numRows(); ++row) for (column = 0; column < m_sheet->numCols(); ++column) @@ -300,12 +300,12 @@ void CSVDialog::fillSheet() if (m_mode != Column) { m_mode = Column; - m_data = QString(m_fileArray); + m_data = TQString(m_fileArray); m_fileArray.resize(0); } - QTextStream inputStream(m_data, IO_ReadOnly); - inputStream.setEncoding(QTextStream::Locale); + TQTextStream inputStream(m_data, IO_ReadOnly); + inputStream.setEncoding(TQTextStream::Locale); while (!inputStream.atEnd()) { @@ -318,7 +318,7 @@ void CSVDialog::fillSheet() case S_START : if (x == m_textquote) { - state = S_QUOTED_FIELD; + state = S_TQUOTED_FIELD; } else if (x == m_delimiter) { @@ -337,10 +337,10 @@ void CSVDialog::fillSheet() state = S_MAYBE_NORMAL_FIELD; } break; - case S_QUOTED_FIELD : + case S_TQUOTED_FIELD : if (x == m_textquote) { - state = S_MAYBE_END_OF_QUOTED_FIELD; + state = S_MAYBE_END_OF_TQUOTED_FIELD; } else if (x == '\n') { @@ -364,11 +364,11 @@ void CSVDialog::fillSheet() field += x; } break; - case S_MAYBE_END_OF_QUOTED_FIELD : + case S_MAYBE_END_OF_TQUOTED_FIELD : if (x == m_textquote) { field += x; - state = S_QUOTED_FIELD; + state = S_TQUOTED_FIELD; } else if (x == m_delimiter || x == '\n') { @@ -389,10 +389,10 @@ void CSVDialog::fillSheet() } else { - state = S_END_OF_QUOTED_FIELD; + state = S_END_OF_TQUOTED_FIELD; } break; - case S_END_OF_QUOTED_FIELD : + case S_END_OF_TQUOTED_FIELD : if (x == m_delimiter || x == '\n') { setText(row - m_startline, column, field); @@ -412,14 +412,14 @@ void CSVDialog::fillSheet() } else { - state = S_END_OF_QUOTED_FIELD; + state = S_END_OF_TQUOTED_FIELD; } break; case S_MAYBE_NORMAL_FIELD : if (x == m_textquote) { field = ""; - state = S_QUOTED_FIELD; + state = S_TQUOTED_FIELD; break; } case S_NORMAL_FIELD : @@ -461,7 +461,7 @@ void CSVDialog::fillSheet() for (column = 0; column < m_sheet->numCols(); ++column) { - QString header = m_sheet->horizontalHeader()->label(column); + TQString header = m_sheet->horizontalHeader()->label(column); if (header != i18n("Text") && header != i18n("Number") && header != i18n("Date") && header != i18n("Currency")) m_sheet->horizontalHeader()->setLabel(column, i18n("Text")); @@ -474,10 +474,10 @@ void CSVDialog::fillComboBox() { m_comboLine->clear(); for (int row = 0; row < m_sheet->numRows(); ++row) - m_comboLine->insertItem(QString::number(row + 1), row); + m_comboLine->insertItem(TQString::number(row + 1), row); } -void CSVDialog::setText(int row, int col, const QString& text) +void CSVDialog::setText(int row, int col, const TQString& text) { if (row < 1) // skipped by the user return; @@ -514,7 +514,7 @@ void CSVDialog::returnPressed() fillSheet(); } -void CSVDialog::textChanged ( const QString & ) +void CSVDialog::textChanged ( const TQString & ) { m_radioOther->setChecked ( true ); delimiterClicked(4); // other @@ -522,7 +522,7 @@ void CSVDialog::textChanged ( const QString & ) void CSVDialog::formatClicked(int id) { - QString header; + TQString header; switch (id) { @@ -567,7 +567,7 @@ void CSVDialog::delimiterClicked(int id) fillSheet(); } -void CSVDialog::textquoteSelected(const QString& mark) +void CSVDialog::textquoteSelected(const TQString& mark) { if (mark == i18n("none")) m_textquote = 0; @@ -577,7 +577,7 @@ void CSVDialog::textquoteSelected(const QString& mark) fillSheet(); } -void CSVDialog::lineSelected(const QString& line) +void CSVDialog::lineSelected(const TQString& line) { m_startline = line.toInt() - 1; fillSheet(); @@ -586,7 +586,7 @@ void CSVDialog::lineSelected(const QString& line) void CSVDialog::currentCellChanged(int, int col) { int id; - QString header = m_sheet->horizontalHeader()->label(col); + TQString header = m_sheet->horizontalHeader()->label(col); if (header == i18n("Text")) id = 1; @@ -603,7 +603,7 @@ void CSVDialog::currentCellChanged(int, int col) void CSVDialog::accept() { Sheet * sheet = m_pView->activeSheet(); - QString csv_delimiter = QString::null; + TQString csv_delimiter = TQString(); Cell * cell; int numRows = m_sheet->numRows(); @@ -647,7 +647,7 @@ void CSVDialog::accept() int left = m_targetRect.left(); int top = m_targetRect.top(); - QMemArray<double> widths( numCols ); + TQMemArray<double> widths( numCols ); for ( i = 0; i < numCols; ++i ) { ColumnFormat * c = sheet->nonDefaultColumnFormat( left + i ); @@ -661,11 +661,11 @@ void CSVDialog::accept() cell = sheet->nonDefaultCell( left + col, top + row ); cell->setCellText( getText( row, col ) ); - QFontMetrics fm = sheet->painter().fontMetrics(); + TQFontMetrics fm = sheet->painter().fontMetrics(); double w = fm.width( cell->strOutText() ); if ( w == 0.0 ) { - QFontMetrics fm( cell->format()->textFont( left + col, top + row ) ); + TQFontMetrics fm( cell->format()->textFont( left + col, top + row ) ); w = fm.width('x') * (double) getText( row, col ).length(); } @@ -705,12 +705,12 @@ void CSVDialog::accept() } m_pView->slotUpdateView( sheet ); - QDialog::accept(); + TQDialog::accept(); } int CSVDialog::getHeader(int col) { - QString header = m_sheet->horizontalHeader()->label(col); + TQString header = m_sheet->horizontalHeader()->label(col); if (header == i18n("Text")) return TEXT; @@ -722,7 +722,7 @@ int CSVDialog::getHeader(int col) return DATE; } -QString CSVDialog::getText(int row, int col) +TQString CSVDialog::getText(int row, int col) { return m_sheet->text(row, col); } diff --git a/kspread/dialogs/kspread_dlg_csv.h b/kspread/dialogs/kspread_dlg_csv.h index ab6769665..1da658386 100644 --- a/kspread/dialogs/kspread_dlg_csv.h +++ b/kspread/dialogs/kspread_dlg_csv.h @@ -25,17 +25,17 @@ #include <kdialogbase.h> -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QButtonGroup; -class QComboBox; -class QCheckBox; -class QLabel; -class QLineEdit; -class QPushButton; -class QRadioButton; -class QTable; +class TQVBoxLayout; +class TQHBoxLayout; +class TQGridLayout; +class TQButtonGroup; +class TQComboBox; +class TQCheckBox; +class TQLabel; +class TQLineEdit; +class TQPushButton; +class TQRadioButton; +class TQTable; namespace KSpread @@ -55,13 +55,14 @@ class View; class CSVDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum Mode { Clipboard, File, Column }; enum Header { TEXT, NUMBER, DATE, CURRENCY }; - CSVDialog( View * parent, const char * name, QRect const & rect, Mode mode); + CSVDialog( View * tqparent, const char * name, TQRect const & rect, Mode mode); ~CSVDialog(); @@ -74,54 +75,54 @@ class CSVDialog : public KDialogBase private: View* m_pView; - QGridLayout* MyDialogLayout; - QHBoxLayout* Layout1; - QGridLayout* m_delimiterBoxLayout; - QGridLayout* m_formatBoxLayout; - QTable* m_sheet; - QButtonGroup* m_delimiterBox; - QRadioButton* m_radioComma; - QRadioButton* m_radioSemicolon; - QRadioButton* m_radioTab; - QRadioButton* m_radioSpace; - QRadioButton* m_radioOther; - QLineEdit* m_delimiterEdit; - QButtonGroup* m_formatBox; - QRadioButton* m_radioNumber; - QRadioButton* m_radioText; - QRadioButton* m_radioCurrency; - QRadioButton* m_radioDate; - QComboBox* m_comboLine; - QComboBox* m_comboQuote; - QLabel* TextLabel3; - QLabel* TextLabel2; - QCheckBox * m_ignoreDuplicates; + TQGridLayout* MyDialogLayout; + TQHBoxLayout* Layout1; + TQGridLayout* m_delimiterBoxLayout; + TQGridLayout* m_formatBoxLayout; + TQTable* m_sheet; + TQButtonGroup* m_delimiterBox; + TQRadioButton* m_radioComma; + TQRadioButton* m_radioSemicolon; + TQRadioButton* m_radioTab; + TQRadioButton* m_radioSpace; + TQRadioButton* m_radioOther; + TQLineEdit* m_delimiterEdit; + TQButtonGroup* m_formatBox; + TQRadioButton* m_radioNumber; + TQRadioButton* m_radioText; + TQRadioButton* m_radioCurrency; + TQRadioButton* m_radioDate; + TQComboBox* m_comboLine; + TQComboBox* m_comboQuote; + TQLabel* TextLabel3; + TQLabel* TextLabel2; + TQCheckBox * m_ignoreDuplicates; void fillSheet(); void fillComboBox(); - void setText(int row, int col, const QString& text); + void setText(int row, int col, const TQString& text); void adjustRows(int iRows); int getHeader(int col); - QString getText(int row, int col); + TQString getText(int row, int col); bool m_cancelled; int m_adjustRows; int m_startline; - QChar m_textquote; - QString m_delimiter; - QString m_data; - QByteArray m_fileArray; - QRect m_targetRect; + TQChar m_textquote; + TQString m_delimiter; + TQString m_data; + TQByteArray m_fileArray; + TQRect m_targetRect; Mode m_mode; private slots: void returnPressed(); void formatClicked(int id); void delimiterClicked(int id); - void lineSelected(const QString& line); - void textquoteSelected(const QString& mark); + void lineSelected(const TQString& line); + void textquoteSelected(const TQString& mark); void currentCellChanged(int, int col); - void textChanged ( const QString & ); + void textChanged ( const TQString & ); void ignoreDuplicatesChanged(int); }; diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc index ca64eb0b2..1bca7c85b 100644 --- a/kspread/dialogs/kspread_dlg_database.cc +++ b/kspread/dialogs/kspread_dlg_database.cc @@ -34,38 +34,38 @@ #include <knumvalidator.h> #include <kpushbutton.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qframe.h> -#include <qheader.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qsqldatabase.h> -#include <qsqlerror.h> -#include <qsqlfield.h> -#include <qsqlquery.h> -#include <qsqlrecord.h> -#include <qtextedit.h> -#include <qtooltip.h> -#include <qvariant.h> -#include <qwhatsthis.h> -#include <qwidget.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqframe.h> +#include <tqheader.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqsqldatabase.h> +#include <tqsqlerror.h> +#include <tqsqlfield.h> +#include <tqsqlquery.h> +#include <tqsqlrecord.h> +#include <tqtextedit.h> +#include <tqtooltip.h> +#include <tqvariant.h> +#include <tqwhatsthis.h> +#include <tqwidget.h> using namespace KSpread; -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL /******************************************************** * Database wizard * ********************************************************/ -DatabaseDialog::DatabaseDialog( View * parent, QRect const & rect, const char * name, bool modal, WFlags fl ) - : KWizard( (QWidget *) parent, name, modal, fl ), +DatabaseDialog::DatabaseDialog( View * tqparent, TQRect const & rect, const char * name, bool modal, WFlags fl ) + : KWizard( (TQWidget *) tqparent, name, modal, fl ), m_currentPage( eDatabase ), - m_pView( parent ), + m_pView( tqparent ), m_targetRect( rect ), m_dbConnection( 0L ) { @@ -76,103 +76,103 @@ DatabaseDialog::DatabaseDialog( View * parent, QRect const & rect, const char * // database page - m_database = new QWidget( this, "m_database" ); - m_databaseLayout = new QGridLayout( m_database, 1, 1, -1, -1, "m_databaseLayout"); + m_database = new TQWidget( this, "m_database" ); + m_databaseLayout = new TQGridLayout( m_database, 1, 1, -1, -1, "m_databaseLayout"); - QFrame * Frame5 = new QFrame( m_database, "Frame5" ); - Frame5->setFrameShape( QFrame::MShape ); - Frame5->setFrameShadow( QFrame::MShadow ); - QVBoxLayout * Frame5Layout = new QVBoxLayout( Frame5, 11, 6, "Frame5Layout"); + TQFrame * Frame5 = new TQFrame( m_database, "Frame5" ); + Frame5->setFrameShape( TQFrame::MShape ); + Frame5->setFrameShadow( TQFrame::MShadow ); + TQVBoxLayout * Frame5Layout = new TQVBoxLayout( Frame5, 11, 6, "Frame5Layout"); - QFrame * Frame16 = new QFrame( Frame5, "Frame16" ); - Frame16->setFrameShape( QFrame::NoFrame ); - Frame16->setFrameShadow( QFrame::Plain ); - QGridLayout * Frame16Layout = new QGridLayout( Frame16, 1, 1, 11, 7, "Frame16Layout"); + TQFrame * Frame16 = new TQFrame( Frame5, "Frame16" ); + Frame16->setFrameShape( TQFrame::NoFrame ); + Frame16->setFrameShadow( TQFrame::Plain ); + TQGridLayout * Frame16Layout = new TQGridLayout( Frame16, 1, 1, 11, 7, "Frame16Layout"); - m_Type = new QLabel( Frame16, "m_Type" ); + m_Type = new TQLabel( Frame16, "m_Type" ); m_Type->setText( i18n( "Type:" ) ); Frame16Layout->addWidget( m_Type, 0, 0 ); - QLabel * TextLabel4 = new QLabel( Frame16, "TextLabel4" ); + TQLabel * TextLabel4 = new TQLabel( Frame16, "TextLabel4" ); TextLabel4->setText( i18n( "User name:\n" "(if necessary)" ) ); Frame16Layout->addWidget( TextLabel4, 4, 0 ); - QLabel * TextLabel2 = new QLabel( Frame16, "TextLabel2" ); + TQLabel * TextLabel2 = new TQLabel( Frame16, "TextLabel2" ); TextLabel2->setText( i18n( "Host:" ) ); Frame16Layout->addWidget( TextLabel2, 2, 0 ); - m_driver = new QComboBox( FALSE, Frame16, "m_driver" ); + m_driver = new TQComboBox( FALSE, Frame16, "m_driver" ); Frame16Layout->addWidget( m_driver, 0, 1 ); - m_username = new QLineEdit( Frame16, "m_username" ); + m_username = new TQLineEdit( Frame16, "m_username" ); Frame16Layout->addWidget( m_username, 4, 1 ); - m_host = new QLineEdit( Frame16, "m_host" ); + m_host = new TQLineEdit( Frame16, "m_host" ); m_host->setText("localhost"); Frame16Layout->addWidget( m_host, 2, 1 ); - QLabel * TextLabel3 = new QLabel( Frame16, "TextLabel3" ); + TQLabel * TextLabel3 = new TQLabel( Frame16, "TextLabel3" ); TextLabel3->setText( i18n( "Port:\n(if necessary)") ); Frame16Layout->addWidget( TextLabel3, 3, 0 ); - m_password = new QLineEdit( Frame16, "m_password" ); - m_password->setEchoMode( QLineEdit::Password ); + m_password = new TQLineEdit( Frame16, "m_password" ); + m_password->setEchoMode( TQLineEdit::Password ); Frame16Layout->addWidget( m_password, 5, 1 ); - m_port = new QLineEdit( Frame16, "m_port" ); + m_port = new TQLineEdit( Frame16, "m_port" ); m_port->setValidator( new KIntValidator( m_port ) ); Frame16Layout->addWidget( m_port, 3, 1 ); - QLabel * dbName = new QLabel( Frame16, "dbName" ); + TQLabel * dbName = new TQLabel( Frame16, "dbName" ); dbName->setText( i18n( "Database name: ") ); Frame16Layout->addWidget( dbName, 1, 0 ); - m_databaseName = new QLineEdit( Frame16, "m_databaseName" ); + m_databaseName = new TQLineEdit( Frame16, "m_databaseName" ); Frame16Layout->addWidget( m_databaseName, 1, 1 ); - QLabel * TextLabel5 = new QLabel( Frame16, "TextLabel5" ); + TQLabel * TextLabel5 = new TQLabel( Frame16, "TextLabel5" ); TextLabel5->setText( i18n( "Password:\n" "(if necessary)" ) ); Frame16Layout->addWidget( TextLabel5, 5, 0 ); Frame5Layout->addWidget( Frame16 ); - m_databaseStatus = new QLabel( Frame5, "m_databaseStatus" ); - m_databaseStatus->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)5, 0, 0, m_databaseStatus->sizePolicy().hasHeightForWidth() ) ); - m_databaseStatus->setMaximumSize( QSize( 32767, 30 ) ); - m_databaseStatus->setText( " " ); - Frame5Layout->addWidget( m_databaseStatus ); + m_databasetqStatus = new TQLabel( Frame5, "m_databasetqStatus" ); + m_databasetqStatus->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, m_databasetqStatus->sizePolicy().hasHeightForWidth() ) ); + m_databasetqStatus->setMaximumSize( TQSize( 32767, 30 ) ); + m_databasetqStatus->setText( " " ); + Frame5Layout->addWidget( m_databasetqStatus ); m_databaseLayout->addWidget( Frame5, 0, 1 ); - QFrame * Frame17 = new QFrame( m_database, "Frame17" ); - Frame17->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)7, 0, 0, Frame17->sizePolicy().hasHeightForWidth() ) ); - Frame17->setMinimumSize( QSize( 111, 0 ) ); - Frame17->setFrameShape( QFrame::NoFrame ); - Frame17->setFrameShadow( QFrame::Plain ); + TQFrame * Frame17 = new TQFrame( m_database, "Frame17" ); + Frame17->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17->sizePolicy().hasHeightForWidth() ) ); + Frame17->setMinimumSize( TQSize( 111, 0 ) ); + Frame17->setFrameShape( TQFrame::NoFrame ); + Frame17->setFrameShadow( TQFrame::Plain ); m_databaseLayout->addWidget( Frame17, 0, 0 ); addPage( m_database, i18n( "Database" ) ); // new page - m_sheet = new QWidget( this, "m_table" ); - m_sheetLayout = new QGridLayout( m_sheet, 1, 1, 11, 6, "m_tableLayout"); + m_sheet = new TQWidget( this, "m_table" ); + m_sheetLayout = new TQGridLayout( m_sheet, 1, 1, 11, 6, "m_tableLayout"); - QFrame * Frame5_2 = new QFrame( m_sheet, "Frame5_2" ); - Frame5_2->setFrameShape( QFrame::MShape ); - Frame5_2->setFrameShadow( QFrame::MShadow ); - QGridLayout * Frame5_2Layout = new QGridLayout( Frame5_2, 1, 1, 11, 6, "Frame5_2Layout"); + TQFrame * Frame5_2 = new TQFrame( m_sheet, "Frame5_2" ); + Frame5_2->setFrameShape( TQFrame::MShape ); + Frame5_2->setFrameShadow( TQFrame::MShadow ); + TQGridLayout * Frame5_2Layout = new TQGridLayout( Frame5_2, 1, 1, 11, 6, "Frame5_2Layout"); - QHBoxLayout * Layout21 = new QHBoxLayout( 0, 0, 6, "Layout21"); + TQHBoxLayout * Layout21 = new TQHBoxLayout( 0, 0, 6, "Layout21"); - // QLabel * TextLabel12_2 = new QLabel( Frame5_2, "TextLabel12_2" ); + // TQLabel * TextLabel12_2 = new TQLabel( Frame5_2, "TextLabel12_2" ); // TextLabel12_2->setText( i18n( "Database:" ) ); // Layout21->addWidget( TextLabel12_2 ); - // m_databaseList = new QComboBox( FALSE, Frame5_2, "m_databaseList" ); + // m_databaseList = new TQComboBox( FALSE, Frame5_2, "m_databaseList" ); // Layout21->addWidget( m_databaseList ); // m_connectButton = new KPushButton( Frame5_2, "m_connectButton" ); @@ -181,11 +181,11 @@ DatabaseDialog::DatabaseDialog( View * parent, QRect const & rect, const char * Frame5_2Layout->addLayout( Layout21, 0, 0 ); - m_sheetStatus = new QLabel( Frame5_2, "m_tableStatus" ); - m_sheetStatus->setText( " " ); - Frame5_2Layout->addWidget( m_sheetStatus, 3, 0 ); + m_sheettqStatus = new TQLabel( Frame5_2, "m_tabletqStatus" ); + m_sheettqStatus->setText( " " ); + Frame5_2Layout->addWidget( m_sheettqStatus, 3, 0 ); - m_SelectSheetLabel = new QLabel( Frame5_2, "m_SelectSheetLabel" ); + m_SelectSheetLabel = new TQLabel( Frame5_2, "m_SelectSheetLabel" ); m_SelectSheetLabel->setText( i18n( "Select tables:" ) ); Frame5_2Layout->addWidget( m_SelectSheetLabel, 1, 0 ); @@ -197,24 +197,24 @@ DatabaseDialog::DatabaseDialog( View * parent, QRect const & rect, const char * m_sheetLayout->addWidget( Frame5_2, 0, 1 ); - QFrame * Frame17_2 = new QFrame( m_sheet, "Frame17_2" ); - Frame17_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)7, 0, 0, Frame17_2->sizePolicy().hasHeightForWidth() ) ); - Frame17_2->setMinimumSize( QSize( 111, 0 ) ); - Frame17_2->setFrameShape( QFrame::NoFrame ); - Frame17_2->setFrameShadow( QFrame::Plain ); + TQFrame * Frame17_2 = new TQFrame( m_sheet, "Frame17_2" ); + Frame17_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_2->sizePolicy().hasHeightForWidth() ) ); + Frame17_2->setMinimumSize( TQSize( 111, 0 ) ); + Frame17_2->setFrameShape( TQFrame::NoFrame ); + Frame17_2->setFrameShadow( TQFrame::Plain ); m_sheetLayout->addWidget( Frame17_2, 0, 0 ); addPage( m_sheet, i18n( "Sheets" ) ); - m_columns = new QWidget( this, "m_columns" ); - m_columnsLayout = new QGridLayout( m_columns, 1, 1, 11, 6, "m_columnsLayout"); + m_columns = new TQWidget( this, "m_columns" ); + m_columnsLayout = new TQGridLayout( m_columns, 1, 1, 11, 6, "m_columnsLayout"); - QFrame * Frame5_2_2 = new QFrame( m_columns, "Frame5_2_2" ); - Frame5_2_2->setFrameShape( QFrame::MShape ); - Frame5_2_2->setFrameShadow( QFrame::MShadow ); - QGridLayout * Frame5_2_2Layout = new QGridLayout( Frame5_2_2, 1, 1, 11, 6, "Frame5_2_2Layout"); + TQFrame * Frame5_2_2 = new TQFrame( m_columns, "Frame5_2_2" ); + Frame5_2_2->setFrameShape( TQFrame::MShape ); + Frame5_2_2->setFrameShadow( TQFrame::MShadow ); + TQGridLayout * Frame5_2_2Layout = new TQGridLayout( Frame5_2_2, 1, 1, 11, 6, "Frame5_2_2Layout"); - QLabel * TextLabel11_2 = new QLabel( Frame5_2_2, "TextLabel11_2" ); + TQLabel * TextLabel11_2 = new TQLabel( Frame5_2_2, "TextLabel11_2" ); TextLabel11_2->setText( i18n( "Select columns:" ) ); Frame5_2_2Layout->addWidget( TextLabel11_2, 0, 0 ); @@ -227,57 +227,57 @@ DatabaseDialog::DatabaseDialog( View * parent, QRect const & rect, const char * Frame5_2_2Layout->addWidget( m_columnView, 1, 0 ); - m_columnsStatus = new QLabel( Frame5_2_2, "m_columnsStatus" ); - m_columnsStatus->setText( " " ); - Frame5_2_2Layout->addWidget( m_columnsStatus, 2, 0 ); + m_columnstqStatus = new TQLabel( Frame5_2_2, "m_columnstqStatus" ); + m_columnstqStatus->setText( " " ); + Frame5_2_2Layout->addWidget( m_columnstqStatus, 2, 0 ); m_columnsLayout->addWidget( Frame5_2_2, 0, 1 ); - QFrame * Frame17_3 = new QFrame( m_columns, "Frame17_3" ); - Frame17_3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)7, 0, 0, Frame17_3->sizePolicy().hasHeightForWidth() ) ); - Frame17_3->setMinimumSize( QSize( 111, 0 ) ); - Frame17_3->setFrameShape( QFrame::NoFrame ); - Frame17_3->setFrameShadow( QFrame::Plain ); + TQFrame * Frame17_3 = new TQFrame( m_columns, "Frame17_3" ); + Frame17_3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_3->sizePolicy().hasHeightForWidth() ) ); + Frame17_3->setMinimumSize( TQSize( 111, 0 ) ); + Frame17_3->setFrameShape( TQFrame::NoFrame ); + Frame17_3->setFrameShadow( TQFrame::Plain ); m_columnsLayout->addWidget( Frame17_3, 0, 0 ); addPage( m_columns, i18n( "Columns" ) ); // options page - m_options = new QWidget( this, "m_options" ); - m_optionsLayout = new QGridLayout( m_options, 1, 1, 11, 6, "m_optionsLayout"); + m_options = new TQWidget( this, "m_options" ); + m_optionsLayout = new TQGridLayout( m_options, 1, 1, 11, 6, "m_optionsLayout"); - QFrame * optionsFrame = new QFrame( m_options, "optionsFrame" ); - optionsFrame->setFrameShape( QFrame::MShape ); - optionsFrame->setFrameShadow( QFrame::MShadow ); - QGridLayout * optionsFrameLayout = new QGridLayout( optionsFrame, 1, 1, 11, 6, "optionsFrameLayout"); + TQFrame * optionsFrame = new TQFrame( m_options, "optionsFrame" ); + optionsFrame->setFrameShape( TQFrame::MShape ); + optionsFrame->setFrameShadow( TQFrame::MShadow ); + TQGridLayout * optionsFrameLayout = new TQGridLayout( optionsFrame, 1, 1, 11, 6, "optionsFrameLayout"); - m_columns_1 = new QComboBox( false, optionsFrame, "m_columns_1" ); + m_columns_1 = new TQComboBox( false, optionsFrame, "m_columns_1" ); optionsFrameLayout->addWidget( m_columns_1, 2, 0 ); - m_operatorValue_2 = new QLineEdit( optionsFrame, "m_operatorValue_2" ); + m_operatorValue_2 = new TQLineEdit( optionsFrame, "m_operatorValue_2" ); optionsFrameLayout->addWidget( m_operatorValue_2, 3, 2 ); - m_andBox = new QRadioButton( optionsFrame, "m_andBox" ); + m_andBox = new TQRadioButton( optionsFrame, "m_andBox" ); m_andBox->setText( i18n( "Match all of the following (AND)" ) ); m_andBox->setChecked( true ); optionsFrameLayout->addMultiCellWidget( m_andBox, 0, 0, 0, 2 ); - m_orBox = new QRadioButton( optionsFrame, "m_orBox" ); + m_orBox = new TQRadioButton( optionsFrame, "m_orBox" ); m_orBox->setText( i18n( "Match any of the following (OR)" ) ); optionsFrameLayout->addMultiCellWidget( m_orBox, 1, 1, 0, 2 ); - m_operatorValue_1 = new QLineEdit( optionsFrame, "m_operatorValue" ); + m_operatorValue_1 = new TQLineEdit( optionsFrame, "m_operatorValue" ); optionsFrameLayout->addWidget( m_operatorValue_1, 2, 2 ); - m_columns_2 = new QComboBox( FALSE, optionsFrame, "m_columns_2" ); + m_columns_2 = new TQComboBox( FALSE, optionsFrame, "m_columns_2" ); optionsFrameLayout->addWidget( m_columns_2, 3, 0 ); - m_operatorValue_3 = new QLineEdit( optionsFrame, "m_operatorValue_3" ); + m_operatorValue_3 = new TQLineEdit( optionsFrame, "m_operatorValue_3" ); optionsFrameLayout->addWidget( m_operatorValue_3, 4, 2 ); - m_operator_1 = new QComboBox( FALSE, optionsFrame, "m_operator_1" ); + m_operator_1 = new TQComboBox( FALSE, optionsFrame, "m_operator_1" ); m_operator_1->insertItem( i18n( "equals" ) ); m_operator_1->insertItem( i18n( "not equal" ) ); m_operator_1->insertItem( i18n( "in" ) ); @@ -290,7 +290,7 @@ DatabaseDialog::DatabaseDialog( View * parent, QRect const & rect, const char * optionsFrameLayout->addWidget( m_operator_1, 2, 1 ); - m_operator_2 = new QComboBox( FALSE, optionsFrame, "m_operator_2" ); + m_operator_2 = new TQComboBox( FALSE, optionsFrame, "m_operator_2" ); m_operator_2->insertItem( i18n( "equals" ) ); m_operator_2->insertItem( i18n( "not equal" ) ); m_operator_2->insertItem( i18n( "in" ) ); @@ -301,7 +301,7 @@ DatabaseDialog::DatabaseDialog( View * parent, QRect const & rect, const char * optionsFrameLayout->addWidget( m_operator_2, 3, 1 ); - m_operator_3 = new QComboBox( FALSE, optionsFrame, "m_operator_3" ); + m_operator_3 = new TQComboBox( FALSE, optionsFrame, "m_operator_3" ); m_operator_3->insertItem( i18n( "equals" ) ); m_operator_3->insertItem( i18n( "not equal" ) ); m_operator_3->insertItem( i18n( "in" ) ); @@ -312,88 +312,88 @@ DatabaseDialog::DatabaseDialog( View * parent, QRect const & rect, const char * optionsFrameLayout->addWidget( m_operator_3, 4, 1 ); - m_columns_3 = new QComboBox( false, optionsFrame, "m_columns_3" ); + m_columns_3 = new TQComboBox( false, optionsFrame, "m_columns_3" ); optionsFrameLayout->addWidget( m_columns_3, 4, 0 ); - m_distinct = new QCheckBox( optionsFrame, "m_distinct" ); + m_distinct = new TQCheckBox( optionsFrame, "m_distinct" ); m_distinct->setText( i18n( "Distinct" ) ); optionsFrameLayout->addWidget( m_distinct, 7, 2 ); - QLabel * TextLabel19 = new QLabel( optionsFrame, "TextLabel19" ); + TQLabel * TextLabel19 = new TQLabel( optionsFrame, "TextLabel19" ); TextLabel19->setText( i18n( "Sorted by" ) ); optionsFrameLayout->addWidget( TextLabel19, 5, 0 ); - m_columnsSort_1 = new QComboBox( false, optionsFrame, "m_columnsSort_1" ); + m_columnsSort_1 = new TQComboBox( false, optionsFrame, "m_columnsSort_1" ); optionsFrameLayout->addWidget( m_columnsSort_1, 5, 1 ); - m_sortMode_1 = new QComboBox( false, optionsFrame, "m_sortMode_1" ); + m_sortMode_1 = new TQComboBox( false, optionsFrame, "m_sortMode_1" ); m_sortMode_1->insertItem( i18n( "Ascending" ) ); m_sortMode_1->insertItem( i18n( "Descending" ) ); optionsFrameLayout->addWidget( m_sortMode_1, 5, 2 ); - QLabel * TextLabel19_2 = new QLabel( optionsFrame, "TextLabel19_2" ); + TQLabel * TextLabel19_2 = new TQLabel( optionsFrame, "TextLabel19_2" ); TextLabel19_2->setText( i18n( "Sorted by" ) ); optionsFrameLayout->addWidget( TextLabel19_2, 6, 0 ); - m_columnsSort_2 = new QComboBox( false, optionsFrame, "m_columnsSort_2" ); + m_columnsSort_2 = new TQComboBox( false, optionsFrame, "m_columnsSort_2" ); optionsFrameLayout->addWidget( m_columnsSort_2, 6, 1 ); - m_sortMode_2 = new QComboBox( false, optionsFrame, "m_sortMode_2" ); + m_sortMode_2 = new TQComboBox( false, optionsFrame, "m_sortMode_2" ); m_sortMode_2->insertItem( i18n( "Ascending" ) ); m_sortMode_2->insertItem( i18n( "Descending" ) ); optionsFrameLayout->addWidget( m_sortMode_2, 6, 2 ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); optionsFrameLayout->addItem( spacer, 7, 1 ); - QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem* spacer_2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); optionsFrameLayout->addItem( spacer_2, 7, 0 ); m_optionsLayout->addWidget( optionsFrame, 0, 1 ); - QFrame * Frame17_4 = new QFrame( m_options, "Frame17_4" ); - Frame17_4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)7, 0, 0, Frame17_4->sizePolicy().hasHeightForWidth() ) ); - Frame17_4->setMinimumSize( QSize( 111, 0 ) ); - Frame17_4->setFrameShape( QFrame::NoFrame ); - Frame17_4->setFrameShadow( QFrame::Plain ); + TQFrame * Frame17_4 = new TQFrame( m_options, "Frame17_4" ); + Frame17_4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_4->sizePolicy().hasHeightForWidth() ) ); + Frame17_4->setMinimumSize( TQSize( 111, 0 ) ); + Frame17_4->setFrameShape( TQFrame::NoFrame ); + Frame17_4->setFrameShadow( TQFrame::Plain ); m_optionsLayout->addWidget( Frame17_4, 0, 0 ); addPage( m_options, i18n( "Query Options" ) ); // result page - m_result = new QWidget( this, "m_result" ); - m_resultLayout = new QGridLayout( m_result, 1, 1, 11, 6, "m_resultLayout"); + m_result = new TQWidget( this, "m_result" ); + m_resultLayout = new TQGridLayout( m_result, 1, 1, 11, 6, "m_resultLayout"); - QFrame * Frame5_2_2_3 = new QFrame( m_result, "Frame5_2_2_3" ); - Frame5_2_2_3->setFrameShape( QFrame::MShape ); - Frame5_2_2_3->setFrameShadow( QFrame::MShadow ); - QGridLayout * Frame5_2_2_3Layout = new QGridLayout( Frame5_2_2_3, 1, 1, 11, 6, "Frame5_2_2_3Layout"); + TQFrame * Frame5_2_2_3 = new TQFrame( m_result, "Frame5_2_2_3" ); + Frame5_2_2_3->setFrameShape( TQFrame::MShape ); + Frame5_2_2_3->setFrameShadow( TQFrame::MShadow ); + TQGridLayout * Frame5_2_2_3Layout = new TQGridLayout( Frame5_2_2_3, 1, 1, 11, 6, "Frame5_2_2_3Layout"); - QLabel * TextLabel17 = new QLabel( Frame5_2_2_3, "TextLabel17" ); + TQLabel * TextLabel17 = new TQLabel( Frame5_2_2_3, "TextLabel17" ); TextLabel17->setText( i18n( "SQL query:" ) ); Frame5_2_2_3Layout->addWidget( TextLabel17, 0, 0 ); - m_sqlQuery = new QTextEdit( Frame5_2_2_3, "m_sqlQuery" ); + m_sqlQuery = new TQTextEdit( Frame5_2_2_3, "m_sqlQuery" ); Frame5_2_2_3Layout->addWidget( m_sqlQuery, 1, 0 ); - QFrame * Frame12 = new QFrame( Frame5_2_2_3, "Frame12" ); - Frame12->setFrameShape( QFrame::StyledPanel ); - Frame12->setFrameShadow( QFrame::Raised ); - QGridLayout * Frame12Layout = new QGridLayout( Frame12, 1, 1, 11, 6, "Frame12Layout"); + TQFrame * Frame12 = new TQFrame( Frame5_2_2_3, "Frame12" ); + Frame12->setFrameShape( TQFrame::StyledPanel ); + Frame12->setFrameShadow( TQFrame::Raised ); + TQGridLayout * Frame12Layout = new TQGridLayout( Frame12, 1, 1, 11, 6, "Frame12Layout"); - m_startingRegion = new QRadioButton( Frame12, "m_startingRegion" ); + m_startingRegion = new TQRadioButton( Frame12, "m_startingRegion" ); m_startingRegion->setText( i18n( "Insert in region" ) ); Frame12Layout->addWidget( m_startingRegion, 0, 0 ); - m_cell = new QLineEdit( Frame12, "m_cell" ); + m_cell = new TQLineEdit( Frame12, "m_cell" ); Frame12Layout->addWidget( m_cell, 1, 1 ); - m_region = new QLineEdit( Frame12, "m_region" ); + m_region = new TQLineEdit( Frame12, "m_region" ); Frame12Layout->addWidget( m_region, 0, 1 ); - m_startingCell = new QRadioButton( Frame12, "m_startingCell" ); + m_startingCell = new TQRadioButton( Frame12, "m_startingCell" ); m_startingCell->setText( i18n( "Starting in cell" ) ); m_startingCell->setChecked( TRUE ); Frame12Layout->addWidget( m_startingCell, 1, 0 ); @@ -401,11 +401,11 @@ DatabaseDialog::DatabaseDialog( View * parent, QRect const & rect, const char * Frame5_2_2_3Layout->addWidget( Frame12, 2, 0 ); m_resultLayout->addWidget( Frame5_2_2_3, 0, 1 ); - QFrame * Frame17_5 = new QFrame( m_result, "Frame17_5" ); - Frame17_5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)7, 0, 0, Frame17_5->sizePolicy().hasHeightForWidth() ) ); - Frame17_5->setMinimumSize( QSize( 111, 0 ) ); - Frame17_5->setFrameShape( QFrame::NoFrame ); - Frame17_5->setFrameShadow( QFrame::Plain ); + TQFrame * Frame17_5 = new TQFrame( m_result, "Frame17_5" ); + Frame17_5->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_5->sizePolicy().hasHeightForWidth() ) ); + Frame17_5->setMinimumSize( TQSize( 111, 0 ) ); + Frame17_5->setFrameShape( TQFrame::NoFrame ); + Frame17_5->setFrameShadow( TQFrame::Plain ); m_resultLayout->addWidget( Frame17_5, 0, 0 ); addPage( m_result, i18n( "Result" ) ); @@ -413,18 +413,18 @@ DatabaseDialog::DatabaseDialog( View * parent, QRect const & rect, const char * finishButton()->setEnabled(false); // signals and slots connections - connect( m_orBox, SIGNAL( clicked() ), this, SLOT( orBox_clicked() ) ); - connect( m_andBox, SIGNAL( clicked() ), this, SLOT( andBox_clicked() ) ); - connect( m_startingCell, SIGNAL( clicked() ), this, SLOT( startingCell_clicked() ) ); - connect( m_startingRegion, SIGNAL( clicked() ), this, SLOT( startingRegion_clicked() ) ); - connect( m_driver, SIGNAL( activated(int) ), this, SLOT( databaseDriverChanged(int) ) ); - connect( m_host, SIGNAL( textChanged(const QString &) ), this, SLOT( databaseHostChanged(const QString &) ) ); - connect( m_databaseName, SIGNAL( textChanged(const QString &) ), this, SLOT( databaseNameChanged(const QString &) ) ); - connect( m_sheetView, SIGNAL( contextMenuRequested( QListViewItem *, const QPoint &, int ) ), - this, SLOT( popupSheetViewMenu(QListViewItem *, const QPoint &, int ) ) ); - connect( m_sheetView, SIGNAL( clicked( QListViewItem * ) ), this, SLOT( sheetViewClicked( QListViewItem * ) ) ); - - QStringList str = QSqlDatabase::drivers(); + connect( m_orBox, TQT_SIGNAL( clicked() ), this, TQT_SLOT( orBox_clicked() ) ); + connect( m_andBox, TQT_SIGNAL( clicked() ), this, TQT_SLOT( andBox_clicked() ) ); + connect( m_startingCell, TQT_SIGNAL( clicked() ), this, TQT_SLOT( startingCell_clicked() ) ); + connect( m_startingRegion, TQT_SIGNAL( clicked() ), this, TQT_SLOT( startingRegion_clicked() ) ); + connect( m_driver, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( databaseDriverChanged(int) ) ); + connect( m_host, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( databaseHostChanged(const TQString &) ) ); + connect( m_databaseName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( databaseNameChanged(const TQString &) ) ); + connect( m_sheetView, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( popupSheetViewMenu(TQListViewItem *, const TQPoint &, int ) ) ); + connect( m_sheetView, TQT_SIGNAL( clicked( TQListViewItem * ) ), this, TQT_SLOT( sheetViewClicked( TQListViewItem * ) ) ); + + TQStringList str = TQSqlDatabase::drivers(); m_driver->insertItem(""); m_driver->insertStringList( str ); @@ -439,7 +439,7 @@ DatabaseDialog::DatabaseDialog( View * parent, QRect const & rect, const char * DatabaseDialog::~DatabaseDialog() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us if ( m_dbConnection ) m_dbConnection->close(); } @@ -579,8 +579,8 @@ void DatabaseDialog::accept() } int i; - QString queryStr; - QString tmp = m_sqlQuery->text(); + TQString queryStr; + TQString tmp = m_sqlQuery->text(); for ( i = 0; i < (int) tmp.length(); ++i ) { if ( tmp[i] != '\n' ) @@ -590,7 +590,7 @@ void DatabaseDialog::accept() } Cell * cell; - QSqlQuery query( QString::null, m_dbConnection ); + TQSqlQuery query( TQString(), m_dbConnection ); // Check the whole query for SQL that might modify database. // If there is an update command, then it must be at the start of the string, @@ -598,8 +598,8 @@ void DatabaseDialog::accept() // An update command must also be followed by a space, or it would be parsed // as an identifier. // For sanity, also check that there is a SELECT - QRegExp couldModifyDB( "(^|[( \\s])(UPDATE|DELETE|INSERT|CREATE) ", false /* cs */ ); - QRegExp couldQueryDB( "(^|[( \\s])(SELECT) ", false /* cs */ ); + TQRegExp couldModifyDB( "(^|[( \\s])(UPDATE|DELETE|INSERT|CREATE) ", false /* cs */ ); + TQRegExp couldQueryDB( "(^|[( \\s])(SELECT) ", false /* cs */ ); if (couldModifyDB.search( queryStr ) != -1 || couldQueryDB.search ( queryStr ) == -1 ) { @@ -647,7 +647,7 @@ void DatabaseDialog::accept() if ( !m_pView->doc()->undoLocked() ) { - QRect r(left, top, count, height); + TQRect r(left, top, count, height); UndoInsertData * undo = new UndoInsertData( m_pView->doc(), sheet, r ); m_pView->doc()->addCommand( undo ); } @@ -692,7 +692,7 @@ void DatabaseDialog::accept() bool DatabaseDialog::databaseDoNext() { - m_dbConnection = QSqlDatabase::addDatabase( m_driver->currentText() ); + m_dbConnection = TQSqlDatabase::addDatabase( m_driver->currentText() ); if ( m_dbConnection ) { @@ -717,11 +717,11 @@ bool DatabaseDialog::databaseDoNext() m_dbConnection->setPort( port ); } - m_databaseStatus->setText( i18n("Connecting to database...") ); + m_databasetqStatus->setText( i18n("Connecting to database...") ); if ( m_dbConnection->open() ) { - m_databaseStatus->setText( i18n("Connected. Retrieving table information...") ); - QStringList sheetList( m_dbConnection->tables() ); + m_databasetqStatus->setText( i18n("Connected. Retrieving table information...") ); + TQStringList sheetList( m_dbConnection->tables() ); if ( sheetList.isEmpty() ) { @@ -734,21 +734,21 @@ bool DatabaseDialog::databaseDoNext() for ( i = 0; i < sheetList.size(); ++i ) { - QCheckListItem * item = new QCheckListItem( m_sheetView, sheetList[i], - QCheckListItem::CheckBox ); + TQCheckListItem * item = new TQCheckListItem( m_sheetView, sheetList[i], + TQCheckListItem::CheckBox ); item->setOn(false); m_sheetView->insertItem( item ); } m_sheetView->setEnabled( true ); - m_databaseStatus->setText( " " ); + m_databasetqStatus->setText( " " ); } else { - QSqlError error = m_dbConnection->lastError(); - QString errorMsg; - QString err1 = error.driverText(); - QString err2 = error.databaseText(); + TQSqlError error = m_dbConnection->lastError(); + TQString errorMsg; + TQString err1 = error.driverText(); + TQString err2 = error.databaseText(); if ( !err1.isEmpty() ) { errorMsg.append( error.driverText() ); @@ -759,7 +759,7 @@ bool DatabaseDialog::databaseDoNext() errorMsg.append( error.databaseText() ); errorMsg.append( "\n" ); } - m_databaseStatus->setText( " " ); + m_databasetqStatus->setText( " " ); KMessageBox::error( this, errorMsg ); return false; @@ -768,7 +768,7 @@ bool DatabaseDialog::databaseDoNext() else { KMessageBox::error( this, i18n("Driver could not be loaded") ); - m_databaseStatus->setText( " " ); + m_databasetqStatus->setText( " " ); return false; } setNextEnabled(m_sheet, true); @@ -778,14 +778,14 @@ bool DatabaseDialog::databaseDoNext() bool DatabaseDialog::sheetsDoNext() { - m_databaseStatus->setText( i18n("Retrieving meta data of tables...") ); - QStringList sheets; + m_databasetqStatus->setText( i18n("Retrieving meta data of tables...") ); + TQStringList sheets; - for (QListViewItem * item = (QCheckListItem *) m_sheetView->firstChild(); item; item = item->nextSibling()) + for (TQListViewItem * item = (TQCheckListItem *) m_sheetView->firstChild(); item; item = item->nextSibling()) { - if (((QCheckListItem * ) item)->isOn()) + if (((TQCheckListItem * ) item)->isOn()) { - sheets.append(((QCheckListItem * ) item)->text()); + sheets.append(((TQCheckListItem * ) item)->text()); } } @@ -796,21 +796,21 @@ bool DatabaseDialog::sheetsDoNext() } m_columnView->clear(); - QSqlRecord info; - QCheckListItem * item; + TQSqlRecord info; + TQCheckListItem * item; for (int i = 0; i < (int) sheets.size(); ++i) { info = m_dbConnection->record( sheets[i] ); for (int j = 0; j < (int) info.count(); ++j) { - QString name = info.fieldName(j); - item = new QCheckListItem( m_columnView, name, - QCheckListItem::CheckBox ); + TQString name = info.fieldName(j); + item = new TQCheckListItem( m_columnView, name, + TQCheckListItem::CheckBox ); item->setOn(false); m_columnView->insertItem( item ); item->setText( 1, sheets[i] ); - QSqlField * field = info.field(name); - item->setText( 2, QVariant::typeToName(field->type()) ); + TQSqlField * field = info.field(name); + item->setText( 2, TQVariant::typeToName(field->type()) ); } } m_columnView->setSorting(1, true); @@ -824,12 +824,12 @@ bool DatabaseDialog::sheetsDoNext() bool DatabaseDialog::columnsDoNext() { - QStringList columns; - for (QListViewItem * item = m_columnView->firstChild(); item; item = item->nextSibling()) + TQStringList columns; + for (TQListViewItem * item = m_columnView->firstChild(); item; item = item->nextSibling()) { - if (((QCheckListItem * ) item)->isOn()) + if (((TQCheckListItem * ) item)->isOn()) { - columns.append( item->text(1) + "." + ((QCheckListItem * ) item)->text()); + columns.append( item->text(1) + "." + ((TQCheckListItem * ) item)->text()); } } @@ -858,11 +858,11 @@ bool DatabaseDialog::columnsDoNext() } -QString DatabaseDialog::getWhereCondition(QString const & column, - QString const & value, +TQString DatabaseDialog::getWhereCondition(TQString const & column, + TQString const & value, int op) { - QString wherePart; + TQString wherePart; switch( op ) { @@ -908,7 +908,7 @@ QString DatabaseDialog::getWhereCondition(QString const & column, if ( op != 2 && op != 3 ) { - QString val; + TQString val; bool ok = false; value.toDouble(&ok); @@ -929,7 +929,7 @@ QString DatabaseDialog::getWhereCondition(QString const & column, } else // "in" & "not in" { - QString val; + TQString val; if (value[0] != '(') val = "("; val += value; @@ -941,21 +941,21 @@ QString DatabaseDialog::getWhereCondition(QString const & column, return wherePart; } -QString DatabaseDialog::exchangeWildcards(QString const & value) +TQString DatabaseDialog::exchangeWildcards(TQString const & value) { - QString str(value); - int p = str.find('*'); + TQString str(value); + int p = str.tqfind('*'); while ( p > -1 ) { - str = str.replace( p, 1, "%" ); - p = str.find('*'); + str = str.tqreplace( p, 1, "%" ); + p = str.tqfind('*'); } - p = str.find('?'); + p = str.tqfind('?'); while ( p > -1 ) { - str = str.replace( p, 1, "_" ); - p = str.find('?'); + str = str.tqreplace( p, 1, "_" ); + p = str.tqfind('?'); } return str; } @@ -964,8 +964,8 @@ bool DatabaseDialog::optionsDoNext() { if ( m_operator_1->currentItem() == 4 ) { - if ( ( m_operatorValue_1->text().find('*') != -1 ) - || ( m_operatorValue_1->text().find('?') != -1 ) ) + if ( ( m_operatorValue_1->text().tqfind('*') != -1 ) + || ( m_operatorValue_1->text().tqfind('?') != -1 ) ) { // xgettext: no-c-format int res = KMessageBox::warningYesNo( this, i18n("'*' or '?' are not valid wildcards in SQL. " @@ -978,8 +978,8 @@ bool DatabaseDialog::optionsDoNext() if ( m_operator_2->currentItem() == 4 ) { - if ( ( m_operatorValue_2->text().find('*') != -1 ) - || ( m_operatorValue_2->text().find('?') != -1 ) ) + if ( ( m_operatorValue_2->text().tqfind('*') != -1 ) + || ( m_operatorValue_2->text().tqfind('?') != -1 ) ) { // xgettext: no-c-format int res = KMessageBox::warningYesNo( this, i18n("'*' or '?' are not valid wildcards in SQL. " @@ -992,8 +992,8 @@ bool DatabaseDialog::optionsDoNext() if ( m_operator_3->currentItem() == 4 ) { - if ( ( m_operatorValue_3->text().find('*') != -1 ) - || ( m_operatorValue_3->text().find('?') != -1 ) ) + if ( ( m_operatorValue_3->text().tqfind('*') != -1 ) + || ( m_operatorValue_3->text().tqfind('?') != -1 ) ) { // xgettext: no-c-format int res = KMessageBox::warningYesNo( this, i18n("'*' or '?' are not valid wildcards in SQL. " @@ -1004,7 +1004,7 @@ bool DatabaseDialog::optionsDoNext() } } - QString query("SELECT "); + TQString query("SELECT "); if (m_distinct->isChecked()) query += "DISTINCT "; @@ -1020,16 +1020,16 @@ bool DatabaseDialog::optionsDoNext() query += "\nFROM "; - QListViewItem * item = (QCheckListItem *) m_sheetView->firstChild(); + TQListViewItem * item = (TQCheckListItem *) m_sheetView->firstChild(); bool b = false; while ( item ) { - if (((QCheckListItem * ) item)->isOn()) + if (((TQCheckListItem * ) item)->isOn()) { if ( b ) query += ", "; b = true; - query += ((QCheckListItem * ) item)->text(); + query += ((TQCheckListItem * ) item)->text(); } item = item->nextSibling(); } @@ -1131,7 +1131,7 @@ void DatabaseDialog::connectButton_clicked() qWarning( "DatabaseDialog::connectButton_clicked(): Not implemented yet!" ); } -void DatabaseDialog::databaseNameChanged(const QString & s) +void DatabaseDialog::databaseNameChanged(const TQString & s) { if ( !m_driver->currentText().isEmpty() && !s.isEmpty() && !m_host->text().isEmpty() ) @@ -1140,7 +1140,7 @@ void DatabaseDialog::databaseNameChanged(const QString & s) setNextEnabled(m_database, false); } -void DatabaseDialog::databaseHostChanged(const QString & s) +void DatabaseDialog::databaseHostChanged(const TQString & s) { if ( !m_driver->currentText().isEmpty() && !s.isEmpty() && !m_databaseName->text().isEmpty() ) @@ -1158,16 +1158,16 @@ void DatabaseDialog::databaseDriverChanged(int index) setNextEnabled(m_database, false); } -void DatabaseDialog::popupSheetViewMenu( QListViewItem *, const QPoint &, int ) +void DatabaseDialog::popupSheetViewMenu( TQListViewItem *, const TQPoint &, int ) { // TODO: popup menu with "Select All", "Inverse selection", "remove selection" } -void DatabaseDialog::sheetViewClicked( QListViewItem * ) +void DatabaseDialog::sheetViewClicked( TQListViewItem * ) { // if ( item ) // { -// QCheckListItem * i = (QCheckListItem *) item; +// TQCheckListItem * i = (TQCheckListItem *) item; // i->setOn( !i->isOn() ); // } // kdDebug() << "clicked" << endl; @@ -1176,4 +1176,4 @@ void DatabaseDialog::sheetViewClicked( QListViewItem * ) #include "kspread_dlg_database.moc" -#endif // QT_NO_SQL +#endif // TQT_NO_SQL diff --git a/kspread/dialogs/kspread_dlg_database.h b/kspread/dialogs/kspread_dlg_database.h index ae958d401..d2e921fe5 100644 --- a/kspread/dialogs/kspread_dlg_database.h +++ b/kspread/dialogs/kspread_dlg_database.h @@ -22,24 +22,24 @@ #ifndef __kspread_dlg_database__ #define __kspread_dlg_database__ -#include <qdialog.h> -#include <qrect.h> +#include <tqdialog.h> +#include <tqrect.h> #include <kwizard.h> -class QCheckBox; -class QComboBox; -class QFrame; -class QGridLayout; -class QLabel; -class QLineEdit; -class QListViewItem; -class QHBoxLayout; -class QRadioButton; -class QSqlDatabase; -class QTextEdit; -class QVBoxLayout; -class QWidget; +class TQCheckBox; +class TQComboBox; +class TQFrame; +class TQGridLayout; +class TQLabel; +class TQLineEdit; +class TQListViewItem; +class TQHBoxLayout; +class TQRadioButton; +class TQSqlDatabase; +class TQTextEdit; +class TQVBoxLayout; +class TQWidget; class KListView; class KPushButton; @@ -50,11 +50,12 @@ class View; class DatabaseDialog : public KWizard { Q_OBJECT + TQ_OBJECT public: enum PageId { eDatabase = 0, eSheets = 1, eColumns = 2, eOptions = 3, eResult = 4 }; - DatabaseDialog( View * parent, QRect const & rect, const char * name = 0, bool modal = FALSE, WFlags fl = 0 ); + DatabaseDialog( View * tqparent, TQRect const & rect, const char * name = 0, bool modal = FALSE, WFlags fl = 0 ); virtual ~DatabaseDialog(); private slots: @@ -63,70 +64,70 @@ class DatabaseDialog : public KWizard void startingCell_clicked(); void startingRegion_clicked(); void connectButton_clicked(); - void databaseNameChanged( const QString & s ); - void databaseHostChanged( const QString & s ); + void databaseNameChanged( const TQString & s ); + void databaseHostChanged( const TQString & s ); void databaseDriverChanged( int ); - void popupSheetViewMenu( QListViewItem *, const QPoint &, int ); - void sheetViewClicked( QListViewItem * ); + void popupSheetViewMenu( TQListViewItem *, const TQPoint &, int ); + void sheetViewClicked( TQListViewItem * ); void accept(); protected: void next(); void back(); - QGridLayout * m_databaseLayout; - QGridLayout * m_sheetLayout; - QGridLayout * m_columnsLayout; - QGridLayout * m_optionsLayout; - QGridLayout * m_resultLayout; + TQGridLayout * m_databaseLayout; + TQGridLayout * m_sheetLayout; + TQGridLayout * m_columnsLayout; + TQGridLayout * m_optionsLayout; + TQGridLayout * m_resultLayout; private: int m_currentPage; View * m_pView; - QRect m_targetRect; - QSqlDatabase * m_dbConnection; - - QWidget * m_database; - QLabel * m_databaseStatus; - QLineEdit * m_username; - QLineEdit * m_port; - QLineEdit * m_databaseName; - QComboBox * m_driver; - QLineEdit * m_password; - QLineEdit * m_host; - QLabel * m_Type; - QWidget * m_sheet; - QComboBox * m_databaseList; + TQRect m_targetRect; + TQSqlDatabase * m_dbConnection; + + TQWidget * m_database; + TQLabel * m_databasetqStatus; + TQLineEdit * m_username; + TQLineEdit * m_port; + TQLineEdit * m_databaseName; + TQComboBox * m_driver; + TQLineEdit * m_password; + TQLineEdit * m_host; + TQLabel * m_Type; + TQWidget * m_sheet; + TQComboBox * m_databaseList; KPushButton * m_connectButton; - QLabel * m_sheetStatus; - QLabel * m_SelectSheetLabel; + TQLabel * m_sheettqStatus; + TQLabel * m_SelectSheetLabel; KListView * m_sheetView; - QWidget * m_columns; + TQWidget * m_columns; KListView * m_columnView; - QLabel * m_columnsStatus; - QWidget * m_options; - QComboBox * m_columns_1; - QComboBox * m_columns_2; - QComboBox * m_columns_3; - QComboBox * m_operator_1; - QComboBox * m_operator_2; - QComboBox * m_operator_3; - QLineEdit * m_operatorValue_1; - QLineEdit * m_operatorValue_2; - QLineEdit * m_operatorValue_3; - QRadioButton * m_andBox; - QRadioButton * m_orBox; - QComboBox * m_columnsSort_1; - QComboBox * m_columnsSort_2; - QComboBox * m_sortMode_1; - QComboBox * m_sortMode_2; - QCheckBox * m_distinct; - QWidget * m_result; - QTextEdit * m_sqlQuery; - QRadioButton * m_startingRegion; - QLineEdit * m_cell; - QLineEdit * m_region; - QRadioButton * m_startingCell; + TQLabel * m_columnstqStatus; + TQWidget * m_options; + TQComboBox * m_columns_1; + TQComboBox * m_columns_2; + TQComboBox * m_columns_3; + TQComboBox * m_operator_1; + TQComboBox * m_operator_2; + TQComboBox * m_operator_3; + TQLineEdit * m_operatorValue_1; + TQLineEdit * m_operatorValue_2; + TQLineEdit * m_operatorValue_3; + TQRadioButton * m_andBox; + TQRadioButton * m_orBox; + TQComboBox * m_columnsSort_1; + TQComboBox * m_columnsSort_2; + TQComboBox * m_sortMode_1; + TQComboBox * m_sortMode_2; + TQCheckBox * m_distinct; + TQWidget * m_result; + TQTextEdit * m_sqlQuery; + TQRadioButton * m_startingRegion; + TQLineEdit * m_cell; + TQLineEdit * m_region; + TQRadioButton * m_startingCell; void switchPage( int id ); bool databaseDoNext(); @@ -134,8 +135,8 @@ class DatabaseDialog : public KWizard bool columnsDoNext(); bool optionsDoNext(); - QString exchangeWildcards(QString const & value); - QString getWhereCondition( QString const &, QString const &, int ); + TQString exchangeWildcards(TQString const & value); + TQString getWhereCondition( TQString const &, TQString const &, int ); }; } // namespace KSpread diff --git a/kspread/dialogs/kspread_dlg_find.cc b/kspread/dialogs/kspread_dlg_find.cc index 397b31d8a..954e0a5c9 100644 --- a/kspread/dialogs/kspread_dlg_find.cc +++ b/kspread/dialogs/kspread_dlg_find.cc @@ -19,49 +19,49 @@ #include "kspread_dlg_find.h" -#include <qcheckbox.h> -#include <qlayout.h> +#include <tqcheckbox.h> +#include <tqlayout.h> #include <klocale.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqcombobox.h> using namespace KSpread; -FindOption::FindOption( QWidget *parent) +FindOption::FindOption( TQWidget *tqparent) { - QVBoxLayout *layout = new QVBoxLayout(parent); - m_moreOptions = new QPushButton( i18n( "More Options" ), parent ); - layout->addWidget( m_moreOptions ); + TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent); + m_moreOptions = new TQPushButton( i18n( "More Options" ), tqparent ); + tqlayout->addWidget( m_moreOptions ); - connect( m_moreOptions, SIGNAL( clicked () ), this, SLOT( slotMoreOptions() ) ); + connect( m_moreOptions, TQT_SIGNAL( clicked () ), this, TQT_SLOT( slotMoreOptions() ) ); - m_findExtension = new QWidget( parent ); - layout->addWidget( m_findExtension ); - QVBoxLayout *layout1 = new QVBoxLayout( m_findExtension ); - m_searchInAllSheet = new QCheckBox( i18n( "Search entire sheet" ),m_findExtension ); - layout1->addWidget( m_searchInAllSheet ); + m_findExtension = new TQWidget( tqparent ); + tqlayout->addWidget( m_findExtension ); + TQVBoxLayout *tqlayout1 = new TQVBoxLayout( m_findExtension ); + m_searchInAllSheet = new TQCheckBox( i18n( "Search entire sheet" ),m_findExtension ); + tqlayout1->addWidget( m_searchInAllSheet ); - QHBoxLayout *comboLayout = new QHBoxLayout( m_findExtension ); - QLabel *label = new QLabel( i18n( "Search in:" ), m_findExtension ); + TQHBoxLayout *comboLayout = new TQHBoxLayout( m_findExtension ); + TQLabel *label = new TQLabel( i18n( "Search in:" ), m_findExtension ); comboLayout->addWidget( label ); - m_searchIn = new QComboBox( m_findExtension ); + m_searchIn = new TQComboBox( m_findExtension ); comboLayout->addWidget( m_searchIn ); - layout1->addLayout( comboLayout ); + tqlayout1->addLayout( comboLayout ); - QStringList lst; + TQStringList lst; lst << i18n( "Cell Values" ); lst << i18n( "Comments" ); m_searchIn->insertStringList( lst ); - comboLayout = new QHBoxLayout( m_findExtension ); - label = new QLabel( i18n( "Search direction:" ), m_findExtension ); + comboLayout = new TQHBoxLayout( m_findExtension ); + label = new TQLabel( i18n( "Search direction:" ), m_findExtension ); comboLayout->addWidget( label ); - m_searchDirection = new QComboBox( m_findExtension ); + m_searchDirection = new TQComboBox( m_findExtension ); comboLayout->addWidget( m_searchDirection ); - layout1->addLayout( comboLayout ); + tqlayout1->addLayout( comboLayout ); lst.clear(); lst << i18n( "Across then Down" ); @@ -115,17 +115,17 @@ bool FindOption::searchInAllSheet() const return m_searchInAllSheet->isChecked(); } -FindDlg::FindDlg(QWidget *parent, const char *name, long options, const QStringList &findStrings, bool hasSelection ) - : KFindDialog(parent,name,options,findStrings,hasSelection ) +FindDlg::FindDlg(TQWidget *tqparent, const char *name, long options, const TQStringList &findStrings, bool hasSelection ) + : KFindDialog(tqparent,name,options,findStrings,hasSelection ) { m_findOptions = new FindOption( findExtension() ); - connect( m_findOptions, SIGNAL( adjustSize() ), SLOT( slotAjustSize() ) ); - setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum)); + connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) ); + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); } FindDlg::~FindDlg() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } void FindDlg::slotAjustSize() @@ -139,17 +139,17 @@ bool FindDlg::searchInAllSheet() const } -SearchDlg::SearchDlg(QWidget *parent, const char *name, long options, const QStringList &findStrings, const QStringList &replaceStrings, bool hasSelection ) - : KReplaceDialog(parent,name,options,findStrings,replaceStrings,hasSelection ) +SearchDlg::SearchDlg(TQWidget *tqparent, const char *name, long options, const TQStringList &findStrings, const TQStringList &replaceStrings, bool hasSelection ) + : KReplaceDialog(tqparent,name,options,findStrings,replaceStrings,hasSelection ) { m_findOptions = new FindOption( findExtension() ); - connect( m_findOptions, SIGNAL( adjustSize() ), SLOT( slotAjustSize() ) ); - setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum)); + connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) ); + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); } SearchDlg::~SearchDlg() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } void SearchDlg::slotAjustSize() diff --git a/kspread/dialogs/kspread_dlg_find.h b/kspread/dialogs/kspread_dlg_find.h index ecf5bf570..d0f35f754 100644 --- a/kspread/dialogs/kspread_dlg_find.h +++ b/kspread/dialogs/kspread_dlg_find.h @@ -22,21 +22,22 @@ #include <kfinddialog.h> -#include <qstringlist.h> +#include <tqstringlist.h> #include <kreplacedialog.h> -class QCheckBox; -class QPushButton; -class QComboBox; +class TQCheckBox; +class TQPushButton; +class TQComboBox; namespace KSpread { -class FindOption : public QObject +class FindOption : public TQObject { Q_OBJECT + TQ_OBJECT public: - FindOption( QWidget *parent); + FindOption( TQWidget *tqparent); bool searchInAllSheet() const; enum searchTypeValue { Value, Note}; @@ -52,19 +53,20 @@ signals: void adjustSize(); private: - QPushButton *m_moreOptions; - QCheckBox *m_searchInAllSheet; - QWidget *m_findExtension; - QComboBox *m_searchIn; - QComboBox *m_searchDirection; + TQPushButton *m_moreOptions; + TQCheckBox *m_searchInAllSheet; + TQWidget *m_findExtension; + TQComboBox *m_searchIn; + TQComboBox *m_searchDirection; }; class FindDlg : public KFindDialog { Q_OBJECT + TQ_OBJECT public: - FindDlg( QWidget *parent = 0, const char *name = 0, long options = 0, const QStringList &findStrings = QStringList(), bool hasSelection = false ); + FindDlg( TQWidget *tqparent = 0, const char *name = 0, long options = 0, const TQStringList &findStrings = TQStringList(), bool hasSelection = false ); ~FindDlg(); bool searchInAllSheet() const; FindOption::searchTypeValue searchType() const { return m_findOptions->searchType(); } @@ -79,9 +81,10 @@ class FindDlg : public KFindDialog class SearchDlg : public KReplaceDialog { Q_OBJECT + TQ_OBJECT public: - SearchDlg( QWidget *parent = 0, const char *name = 0, long options = 0, const QStringList &findStrings = QStringList(), const QStringList &replaceStrings = QStringList(), bool hasSelection = false ); + SearchDlg( TQWidget *tqparent = 0, const char *name = 0, long options = 0, const TQStringList &findStrings = TQStringList(), const TQStringList &replaceStrings = TQStringList(), bool hasSelection = false ); ~SearchDlg(); bool searchInAllSheet() const; FindOption::searchTypeValue searchType() const { return m_findOptions->searchType(); } diff --git a/kspread/dialogs/kspread_dlg_format.cc b/kspread/dialogs/kspread_dlg_format.cc index 98c6d02e4..6374c1020 100644 --- a/kspread/dialogs/kspread_dlg_format.cc +++ b/kspread/dialogs/kspread_dlg_format.cc @@ -23,11 +23,11 @@ * Boston, MA 02110-1301, USA. */ -#include <qcombobox.h> -#include <qfile.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qpushbutton.h> +#include <tqcombobox.h> +#include <tqfile.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqpushbutton.h> #include <kbuttonbox.h> #include <kmessagebox.h> @@ -54,22 +54,22 @@ FormatDialog::FormatDialog( View* view, const char* name ) m_cells[ i ] = 0; m_view = view; - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QVBoxLayout *vbox = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *vbox = new TQVBoxLayout( page, 0, spacingHint() ); - QLabel *toplabel = new QLabel( i18n("Select the sheet style to apply:"), page ); - m_combo = new QComboBox( page ); - m_label = new QLabel( page ); + TQLabel *toplabel = new TQLabel( i18n("Select the sheet style to apply:"), page ); + m_combo = new TQComboBox( page ); + m_label = new TQLabel( page ); vbox->addWidget( toplabel ); vbox->addWidget( m_combo ); vbox->addWidget( m_label ); - QStringList lst = Factory::global()->dirs()->findAllResources( "sheet-styles", "*.ksts", TRUE ); + TQStringList lst = Factory::global()->dirs()->findAllResources( "sheet-styles", "*.ksts", TRUE ); - QStringList::Iterator it = lst.begin(); + TQStringList::Iterator it = lst.begin(); for( ; it != lst.end(); ++it ) { KSimpleConfig cfg( *it, TRUE ); @@ -88,8 +88,8 @@ FormatDialog::FormatDialog( View* view, const char* name ) slotActivated( 0 ); - connect( this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) ); - connect( m_combo, SIGNAL( activated( int ) ), this, SLOT( slotActivated( int ) ) ); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect( m_combo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) ); } FormatDialog::~FormatDialog() @@ -102,11 +102,11 @@ void FormatDialog::slotActivated( int index ) { enableButtonOK(true); - QString img = Factory::global()->dirs()->findResource( "sheet-styles", m_entries[ index ].image ); + TQString img = Factory::global()->dirs()->findResource( "sheet-styles", m_entries[ index ].image ); if ( img.isEmpty() ) { - QString str( i18n( "Could not find image %1." ) ); - str = str.arg( m_entries[ index ].image ); + TQString str( i18n( "Could not find image %1." ) ); + str = str.tqarg( m_entries[ index ].image ); KMessageBox::error( this, str ); enableButtonOK(false); @@ -114,11 +114,11 @@ void FormatDialog::slotActivated( int index ) return; } - QPixmap pix( img ); + TQPixmap pix( img ); if ( pix.isNull() ) { - QString str( i18n( "Could not load image %1." ) ); - str = str.arg( img ); + TQString str( i18n( "Could not load image %1." ) ); + str = str.tqarg( img ); KMessageBox::error( this,str ); enableButtonOK(false); @@ -134,34 +134,34 @@ void FormatDialog::slotOk() m_view->doc()->emitBeginOperation( false ); - QString xml = Factory::global()->dirs()->findResource( "sheet-styles", m_entries[ m_combo->currentItem() ].xml ); + TQString xml = Factory::global()->dirs()->findResource( "sheet-styles", m_entries[ m_combo->currentItem() ].xml ); if ( xml.isEmpty() ) { - QString str( i18n( "Could not find sheet-style XML file '%1'." ) ); - str = str.arg( m_entries[ m_combo->currentItem() ].xml ); + TQString str( i18n( "Could not find sheet-style XML file '%1'." ) ); + str = str.tqarg( m_entries[ m_combo->currentItem() ].xml ); KMessageBox::error( this, str ); return; } - QFile file( xml ); + TQFile file( xml ); file.open( IO_ReadOnly ); - QDomDocument doc; + TQDomDocument doc; doc.setContent( &file ); file.close(); if ( !parseXML( doc ) ) { - QString str( i18n( "Parsing error in sheet-style XML file %1." ) ); - str = str.arg( m_entries[ m_combo->currentItem() ].xml ); + TQString str( i18n( "Parsing error in sheet-style XML file %1." ) ); + str = str.tqarg( m_entries[ m_combo->currentItem() ].xml ); KMessageBox::error( this, str ); return; } - QRect r = m_view->selectionInfo()->selection(); + TQRect r = m_view->selectionInfo()->selection(); if ( !m_view->doc()->undoLocked() ) { - QString title=i18n("Change Format"); + TQString title=i18n("Change Format"); UndoCellFormat *undo = new UndoCellFormat( m_view->doc(), m_view->activeSheet(), r, title); m_view->doc()->addCommand( undo ); } @@ -317,7 +317,7 @@ void FormatDialog::slotOk() accept(); } -bool FormatDialog::parseXML( const QDomDocument& doc ) +bool FormatDialog::parseXML( const TQDomDocument& doc ) { for( int i = 0; i < 16; ++i ) { @@ -325,7 +325,7 @@ bool FormatDialog::parseXML( const QDomDocument& doc ) m_cells[ i ] = 0; } - QDomElement e = doc.documentElement().firstChild().toElement(); + TQDomElement e = doc.documentElement().firstChild().toElement(); for( ; !e.isNull(); e = e.nextSibling().toElement() ) { if ( e.tagName() == "cell" ) diff --git a/kspread/dialogs/kspread_dlg_format.h b/kspread/dialogs/kspread_dlg_format.h index f7c0d23b6..a482c13e7 100644 --- a/kspread/dialogs/kspread_dlg_format.h +++ b/kspread/dialogs/kspread_dlg_format.h @@ -27,15 +27,15 @@ #define KSPREAD_DLG_FORMAT #include <kdialogbase.h> -#include <qstring.h> -#include <qvaluelist.h> -#include <qcolor.h> -#include <qpen.h> -#include <qfont.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqcolor.h> +#include <tqpen.h> +#include <tqfont.h> -class QComboBox; -class QLabel; -class QDomDocument; +class TQComboBox; +class TQLabel; +class TQDomDocument; namespace KSpread { @@ -49,6 +49,7 @@ class View; class FormatDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: FormatDialog( View* view, const char* name = 0 ); ~FormatDialog(); @@ -58,20 +59,20 @@ private slots: void slotOk(); private: - bool parseXML( const QDomDocument& doc ); + bool parseXML( const TQDomDocument& doc ); - QComboBox* m_combo; - QLabel* m_label; + TQComboBox* m_combo; + TQLabel* m_label; View* m_view; struct Entry { - QString xml; - QString image; - QString config; - QString name; + TQString xml; + TQString image; + TQString config; + TQString name; }; - QValueList<Entry> m_entries; + TQValueList<Entry> m_entries; Format* m_cells[ 16 ]; }; diff --git a/kspread/dialogs/kspread_dlg_formula.cc b/kspread/dialogs/kspread_dlg_formula.cc index 54100b8c9..0981a4e70 100644 --- a/kspread/dialogs/kspread_dlg_formula.cc +++ b/kspread/dialogs/kspread_dlg_formula.cc @@ -24,8 +24,8 @@ * Boston, MA 02110-1301, USA. */ -#include <qtextbrowser.h> -#include <qtabwidget.h> +#include <tqtextbrowser.h> +#include <tqtabwidget.h> #include "kspread_dlg_formula.h" #include "kspread_canvas.h" @@ -43,22 +43,22 @@ #include <kdebug.h> #include <kbuttonbox.h> #include <knumvalidator.h> -#include <qcombobox.h> -#include <qevent.h> -#include <qlistbox.h> -#include <qlabel.h> -#include <qpushbutton.h> +#include <tqcombobox.h> +#include <tqevent.h> +#include <tqlistbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> #include <klineedit.h> -#include <qlayout.h> +#include <tqlayout.h> using namespace KSpread; -FormulaDialog::FormulaDialog( View* parent, const char* name,const QString& formulaName) - : KDialogBase( parent, name,false,i18n("Function"), Ok|Cancel ) +FormulaDialog::FormulaDialog( View* tqparent, const char* name,const TQString& formulaName) + : KDialogBase( tqparent, name,false,i18n("Function"), Ok|Cancel ) { - setWFlags( Qt::WDestructiveClose ); + setWFlags( TQt::WDestructiveClose ); - m_pView = parent; + m_pView = tqparent; m_focus = 0; m_desc = 0; @@ -80,80 +80,80 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const QString& form Q_ASSERT( m_pView->canvasWidget()->editor() ); - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QGridLayout *grid1 = new QGridLayout(page,11,2,KDialog::marginHint(), KDialog::spacingHint()); + TQGridLayout *grid1 = new TQGridLayout(page,11,2,KDialog::marginHint(), KDialog::spacingHint()); searchFunct = new KLineEdit(page); - QSizePolicy sp3( QSizePolicy::Preferred, QSizePolicy::Fixed ); - searchFunct->setSizePolicy( sp3 ); + TQSizePolicy sp3( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); + searchFunct->tqsetSizePolicy( sp3 ); grid1->addWidget( searchFunct, 0, 0 ); - typeFunction = new QComboBox(page); - QStringList cats = FunctionRepository::self()->groups(); + typeFunction = new TQComboBox(page); + TQStringList cats = FunctionRepository::self()->groups(); cats.prepend( i18n("All") ); typeFunction->insertStringList( cats ); grid1->addWidget( typeFunction, 1, 0 ); - functions = new QListBox(page); - QSizePolicy sp1( QSizePolicy::Preferred, QSizePolicy::Expanding ); - functions->setSizePolicy( sp1 ); + functions = new TQListBox(page); + TQSizePolicy sp1( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); + functions->tqsetSizePolicy( sp1 ); grid1->addWidget( functions, 2, 0 ); - selectFunction = new QPushButton( page ); - QToolTip::add(selectFunction, i18n("Insert function") ); + selectFunction = new TQPushButton( page ); + TQToolTip::add(selectFunction, i18n("Insert function") ); selectFunction->setPixmap( BarIcon( "down", KIcon::SizeSmall ) ); grid1->addWidget( selectFunction, 3, 0 ); - result = new QLineEdit( page ); + result = new TQLineEdit( page ); grid1->addMultiCellWidget( result, 4, 4, 0, 1 ); - m_tabwidget = new QTabWidget( page ); - QSizePolicy sp2( QSizePolicy::Expanding, QSizePolicy::Expanding ); - m_tabwidget->setSizePolicy( sp2 ); + m_tabwidget = new TQTabWidget( page ); + TQSizePolicy sp2( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + m_tabwidget->tqsetSizePolicy( sp2 ); grid1->addMultiCellWidget( m_tabwidget, 0, 2, 1, 1 ); - m_browser = new QTextBrowser( m_tabwidget ); + m_browser = new TQTextBrowser( m_tabwidget ); m_browser->setMinimumWidth( 300 ); m_tabwidget->addTab( m_browser, i18n("&Help") ); int index = m_tabwidget->currentPageIndex(); - m_input = new QWidget( m_tabwidget ); - QVBoxLayout *grid2 = new QVBoxLayout( m_input, KDialog::marginHint(), KDialog::spacingHint() ); + m_input = new TQWidget( m_tabwidget ); + TQVBoxLayout *grid2 = new TQVBoxLayout( m_input, KDialog::marginHint(), KDialog::spacingHint() ); - // grid2->setResizeMode (QLayout::Minimum); + // grid2->setResizeMode (TQLayout::Minimum); - label1 = new QLabel(m_input); + label1 = new TQLabel(m_input); grid2->addWidget( label1 ); - firstElement=new QLineEdit(m_input); + firstElement=new TQLineEdit(m_input); grid2->addWidget( firstElement ); - label2=new QLabel(m_input); + label2=new TQLabel(m_input); grid2->addWidget( label2 ); - secondElement=new QLineEdit(m_input); + secondElement=new TQLineEdit(m_input); grid2->addWidget( secondElement ); - label3=new QLabel(m_input); + label3=new TQLabel(m_input); grid2->addWidget( label3 ); - thirdElement=new QLineEdit(m_input); + thirdElement=new TQLineEdit(m_input); grid2->addWidget( thirdElement ); - label4=new QLabel(m_input); + label4=new TQLabel(m_input); grid2->addWidget( label4 ); - fourElement=new QLineEdit(m_input); + fourElement=new TQLineEdit(m_input); grid2->addWidget( fourElement ); - label5=new QLabel(m_input); + label5=new TQLabel(m_input); grid2->addWidget( label5 ); - fiveElement=new QLineEdit(m_input); + fiveElement=new TQLineEdit(m_input); grid2->addWidget( fiveElement ); grid2->addStretch( 10 ); @@ -165,43 +165,43 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const QString& form refresh_result = true; - connect( this, SIGNAL( cancelClicked() ), this, SLOT( slotClose() ) ); - connect( this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) ); - connect( typeFunction, SIGNAL( activated(const QString &) ), - this, SLOT( slotActivated(const QString &) ) ); - connect( functions, SIGNAL( highlighted(const QString &) ), - this, SLOT( slotSelected(const QString &) ) ); - connect( functions, SIGNAL( selected(const QString &) ), - this, SLOT( slotSelected(const QString &) ) ); - connect( functions, SIGNAL( doubleClicked(QListBoxItem * ) ), - this ,SLOT( slotDoubleClicked(QListBoxItem *) ) ); + connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotClose() ) ); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect( typeFunction, TQT_SIGNAL( activated(const TQString &) ), + this, TQT_SLOT( slotActivated(const TQString &) ) ); + connect( functions, TQT_SIGNAL( highlighted(const TQString &) ), + this, TQT_SLOT( slotSelected(const TQString &) ) ); + connect( functions, TQT_SIGNAL( selected(const TQString &) ), + this, TQT_SLOT( slotSelected(const TQString &) ) ); + connect( functions, TQT_SIGNAL( doubleClicked(TQListBoxItem * ) ), + this ,TQT_SLOT( slotDoubleClicked(TQListBoxItem *) ) ); slotActivated(i18n("All")); - connect( selectFunction, SIGNAL(clicked()), - this,SLOT(slotSelectButton())); + connect( selectFunction, TQT_SIGNAL(clicked()), + this,TQT_SLOT(slotSelectButton())); - connect( firstElement,SIGNAL(textChanged ( const QString & )), - this,SLOT(slotChangeText(const QString &))); - connect( secondElement,SIGNAL(textChanged ( const QString & )), - this,SLOT(slotChangeText(const QString &))); - connect( thirdElement,SIGNAL(textChanged ( const QString & )), - this,SLOT(slotChangeText(const QString &))); - connect( fourElement,SIGNAL(textChanged ( const QString & )), - this,SLOT(slotChangeText(const QString &))); - connect( fiveElement,SIGNAL(textChanged ( const QString & )), - this,SLOT(slotChangeText(const QString &))); + connect( firstElement,TQT_SIGNAL(textChanged ( const TQString & )), + this,TQT_SLOT(slotChangeText(const TQString &))); + connect( secondElement,TQT_SIGNAL(textChanged ( const TQString & )), + this,TQT_SLOT(slotChangeText(const TQString &))); + connect( thirdElement,TQT_SIGNAL(textChanged ( const TQString & )), + this,TQT_SLOT(slotChangeText(const TQString &))); + connect( fourElement,TQT_SIGNAL(textChanged ( const TQString & )), + this,TQT_SLOT(slotChangeText(const TQString &))); + connect( fiveElement,TQT_SIGNAL(textChanged ( const TQString & )), + this,TQT_SLOT(slotChangeText(const TQString &))); - connect( m_pView->choice(), SIGNAL(changed(const Region&)), - this, SLOT(slotSelectionChanged())); + connect( m_pView->choice(), TQT_SIGNAL(changed(const Region&)), + this, TQT_SLOT(slotSelectionChanged())); - connect( m_browser, SIGNAL( linkClicked( const QString& ) ), - this, SLOT( slotShowFunction( const QString& ) ) ); + connect( m_browser, TQT_SIGNAL( linkClicked( const TQString& ) ), + this, TQT_SLOT( slotShowFunction( const TQString& ) ) ); // Save the name of the active sheet. m_sheetName = m_pView->activeSheet()->sheetName(); // Save the cells current text. - QString tmp_oldText = m_pView->canvasWidget()->editor()->text(); + TQString tmp_oldText = m_pView->canvasWidget()->editor()->text(); // Position of the cell. m_column = m_pView->canvasWidget()->markerColumn(); m_row = m_pView->canvasWidget()->markerRow(); @@ -219,13 +219,13 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const QString& form // Allow the user to select cells on the spreadsheet. m_pView->canvasWidget()->startChoose(); - qApp->installEventFilter( this ); + tqApp->installEventFilter( this ); // Was a function name passed along with the constructor ? Then activate it. if( !formulaName.isEmpty() ) { - functions->setCurrentItem( functions->index( functions->findItem( formulaName ) ) ); - slotDoubleClicked( functions->findItem( formulaName ) ); + functions->setCurrentItem( functions->index( functions->tqfindItem( formulaName ) ) ); + slotDoubleClicked( functions->tqfindItem( formulaName ) ); } else { @@ -240,10 +240,10 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const QString& form if( functions->currentItem() == -1 ) selectFunction->setEnabled( false ); - connect( searchFunct, SIGNAL( textChanged( const QString & ) ), - this, SLOT( slotSearchText(const QString &) ) ); - connect( searchFunct, SIGNAL( returnPressed() ), - this, SLOT( slotPressReturn() ) ); + connect( searchFunct, TQT_SIGNAL( textChanged( const TQString & ) ), + this, TQT_SLOT( slotSearchText(const TQString &) ) ); + connect( searchFunct, TQT_SIGNAL( returnPressed() ), + this, TQT_SLOT( slotPressReturn() ) ); } FormulaDialog::~FormulaDialog() @@ -262,24 +262,24 @@ void FormulaDialog::slotPressReturn() */ } -void FormulaDialog::slotSearchText(const QString &_text) +void FormulaDialog::slotSearchText(const TQString &_text) { - QString result = listFunct.makeCompletion( _text.upper() ); + TQString result = listFunct.makeCompletion( _text.upper() ); if( !result.isNull() ) - functions->setCurrentItem( functions->index( functions->findItem( result ) ) ); + functions->setCurrentItem( functions->index( functions->tqfindItem( result ) ) ); } -bool FormulaDialog::eventFilter( QObject* obj, QEvent* ev ) +bool FormulaDialog::eventFilter( TQObject* obj, TQEvent* ev ) { - if ( obj == firstElement && ev->type() == QEvent::FocusIn ) + if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(firstElement) && ev->type() == TQEvent::FocusIn ) m_focus = firstElement; - else if ( obj == secondElement && ev->type() == QEvent::FocusIn ) + else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(secondElement) && ev->type() == TQEvent::FocusIn ) m_focus = secondElement; - else if ( obj == thirdElement && ev->type() == QEvent::FocusIn ) + else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(thirdElement) && ev->type() == TQEvent::FocusIn ) m_focus = thirdElement; - else if ( obj == fourElement && ev->type() == QEvent::FocusIn ) + else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(fourElement) && ev->type() == TQEvent::FocusIn ) m_focus = fourElement; - else if ( obj == fiveElement && ev->type() == QEvent::FocusIn ) + else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(fiveElement) && ev->type() == TQEvent::FocusIn ) m_focus = fiveElement; else return FALSE; @@ -304,14 +304,14 @@ void FormulaDialog::slotOk() } // Revert the marker to its original position - m_pView->selectionInfo()->initialize( QPoint( m_column, m_row ) ); + m_pView->selectionInfo()->initialize( TQPoint( m_column, m_row ) ); // If there is still an editor then set the text. // Usually the editor is always in place. if( m_pView->canvasWidget()->editor() != 0 ) { Q_ASSERT( m_pView->canvasWidget()->editor() ); - QString tmp = result->text(); + TQString tmp = result->text(); if( tmp.at(0) != '=') tmp = "=" + tmp; int pos = m_pView->canvasWidget()->editor()->cursorPosition()+ tmp.length(); @@ -342,7 +342,7 @@ void FormulaDialog::slotClose() // Revert the marker to its original position - m_pView->selectionInfo()->initialize( QPoint( m_column, m_row ) ); + m_pView->selectionInfo()->initialize( TQPoint( m_column, m_row ) ); // If there is still an editor then reset the text. // Usually the editor is always in place. @@ -364,11 +364,11 @@ void FormulaDialog::slotSelectButton() { if( functions->currentItem() != -1 ) { - slotDoubleClicked(functions->findItem(functions->text(functions->currentItem()))); + slotDoubleClicked(functions->tqfindItem(functions->text(functions->currentItem()))); } } -void FormulaDialog::slotChangeText( const QString& ) +void FormulaDialog::slotChangeText( const TQString& ) { // Test the lock if( !refresh_result ) @@ -377,19 +377,19 @@ void FormulaDialog::slotChangeText( const QString& ) if ( m_focus == 0 ) return; - QString tmp = m_leftText+m_funcName+"("; + TQString tmp = m_leftText+m_funcName+"("; tmp += createFormula(); tmp = tmp+ ")" + m_rightText; result->setText( tmp ); } -QString FormulaDialog::createFormula() +TQString FormulaDialog::createFormula() { - QString tmp( "" ); + TQString tmp( "" ); if ( !m_desc ) - return QString::null; + return TQString(); bool first = TRUE; @@ -437,15 +437,15 @@ QString FormulaDialog::createFormula() return(tmp); } -QString FormulaDialog::createParameter( const QString& _text, int param ) +TQString FormulaDialog::createParameter( const TQString& _text, int param ) { if ( _text.isEmpty() ) - return QString( "" ); + return TQString( "" ); if ( !m_desc ) - return QString( "" ); + return TQString( "" ); - QString text; + TQString text; ParameterType elementType = m_desc->param( param ).type(); @@ -470,13 +470,13 @@ QString FormulaDialog::createParameter( const QString& _text, int param ) text = "\\"; // changed: was "\"" // Escape quotes - QString tmp = _text; + TQString tmp = _text; int pos; int start = 1; - while( ( pos = tmp.find( '"', start ) ) != -1 ) + while( ( pos = tmp.tqfind( '"', start ) ) != -1 ) { if (tmp[pos - 1] != '\\') - tmp.replace( pos, 1, "\\\"" ); + tmp.tqreplace( pos, 1, "\\\"" ); else start = pos + 1; } @@ -494,13 +494,13 @@ QString FormulaDialog::createParameter( const QString& _text, int param ) text = "\""; // Escape quotes - QString tmp = _text; + TQString tmp = _text; int pos; int start = 1; - while( ( pos = tmp.find( '"', start ) ) != -1 ) + while( ( pos = tmp.tqfind( '"', start ) ) != -1 ) { if (tmp[pos - 1] != '\\') - tmp.replace( pos, 1, "\\\"" ); + tmp.tqreplace( pos, 1, "\\\"" ); else start = pos + 1; } @@ -525,7 +525,7 @@ QString FormulaDialog::createParameter( const QString& _text, int param ) return text; } -static void showEntry( QLineEdit* edit, QLabel* label, +static void showEntry( TQLineEdit* edit, TQLabel* label, FunctionDescription* desc, int param ) { edit->show(); @@ -547,14 +547,14 @@ static void showEntry( QLineEdit* edit, QLabel* label, edit->setText( "0" ); break; case KSpread_Int: - edit->setValidator(new QIntValidator (edit)); + edit->setValidator(new TQIntValidator (TQT_TQOBJECT(edit))); edit->setText( "0" ); break; } } -void FormulaDialog::slotDoubleClicked( QListBoxItem* item ) +void FormulaDialog::slotDoubleClicked( TQListBoxItem* item ) { if ( !item ) return; @@ -568,13 +568,13 @@ void FormulaDialog::slotDoubleClicked( QListBoxItem* item ) m_focus = 0; int old_length = result->text().length(); - // Dont change order of these function calls due to a bug in Qt 2.2 - m_browser->setText( m_desc->toQML() ); + // Dont change order of these function calls due to a bug in TQt 2.2 + m_browser->setText( m_desc->toTQML() ); m_tabwidget->setTabEnabled( m_input, TRUE ); m_tabwidget->setCurrentPage( 1 ); // - // Show as many QLineEdits as needed. + // Show as many TQLineEdits as needed. // if( m_desc->params() > 0 ) { @@ -654,7 +654,7 @@ void FormulaDialog::slotDoubleClicked( QListBoxItem* item ) result->setText("=" + result->text()); // - // Put focus somewhere is there are no QLineEdits visible + // Put focus somewhere is there are no TQLineEdits visible // if( m_desc->params() == 0 ) { @@ -667,7 +667,7 @@ void FormulaDialog::slotDoubleClicked( QListBoxItem* item ) slotChangeText( "" ); } -void FormulaDialog::slotSelected( const QString& function ) +void FormulaDialog::slotSelected( const TQString& function ) { FunctionDescription* desc = FunctionRepository::self()->functionInfo (function); @@ -687,7 +687,7 @@ void FormulaDialog::slotSelected( const QString& function ) m_desc = desc; // Set the help text - m_browser->setText( m_desc->toQML() ); + m_browser->setText( m_desc->toTQML() ); m_browser->setContentsPos( 0, 0 ); m_focus=0; @@ -700,20 +700,20 @@ void FormulaDialog::slotSelected( const QString& function ) } // from hyperlink in the "Related Function" -void FormulaDialog::slotShowFunction( const QString& function ) +void FormulaDialog::slotShowFunction( const TQString& function ) { FunctionDescription* desc = FunctionRepository::self()->functionInfo( function ); if ( !desc ) return; // select the category - QString category = desc->group(); + TQString category = desc->group(); typeFunction->setCurrentText( category ); slotActivated( category ); // select the function - QListBoxItem* item = functions->findItem( function, - Qt::ExactMatch | Qt::CaseSensitive ); + TQListBoxItem* item = functions->tqfindItem( function, + TQt::ExactMatch | TQt::CaseSensitive ); if( item ) functions->setCurrentItem( item ); slotSelected( function ); @@ -726,14 +726,14 @@ void FormulaDialog::slotSelectionChanged() if (m_pView->choice()->isValid()) { - QString area = m_pView->choice()->name(); + TQString area = m_pView->choice()->name(); m_focus->setText( area ); } } -void FormulaDialog::slotActivated( const QString& category ) +void FormulaDialog::slotActivated( const TQString& category ) { - QStringList lst; + TQStringList lst; if ( category == i18n("All") ) lst = FunctionRepository::self()->functionNames(); else @@ -744,8 +744,8 @@ void FormulaDialog::slotActivated( const QString& category ) functions->clear(); functions->insertStringList( lst ); - QStringList upperList; - for ( QStringList::Iterator it = lst.begin(); it != lst.end();++it ) + TQStringList upperList; + for ( TQStringList::Iterator it = lst.begin(); it != lst.end();++it ) upperList.append((*it).upper()); listFunct.setItems( upperList ); @@ -755,7 +755,7 @@ void FormulaDialog::slotActivated( const QString& category ) slotSelected( functions->text(0) ); } -void FormulaDialog::closeEvent ( QCloseEvent * e ) +void FormulaDialog::closeEvent ( TQCloseEvent * e ) { e->accept(); } diff --git a/kspread/dialogs/kspread_dlg_formula.h b/kspread/dialogs/kspread_dlg_formula.h index d4e224e79..62ffef199 100644 --- a/kspread/dialogs/kspread_dlg_formula.h +++ b/kspread/dialogs/kspread_dlg_formula.h @@ -27,18 +27,18 @@ #ifndef __kspread_dlg_formula__ #define __kspread_dlg_formula__ -#include <qframe.h> +#include <tqframe.h> #include <kcompletion.h> #include <kdialogbase.h> -class QComboBox; -class QLabel; -class QLineEdit; -class QListBox; -class QPushButton; -class QTabWidget; -class QTextBrowser; +class TQComboBox; +class TQLabel; +class TQLineEdit; +class TQListBox; +class TQPushButton; +class TQTabWidget; +class TQTextBrowser; class KLineEdit; namespace KSpread @@ -50,20 +50,21 @@ class View; class FormulaDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - FormulaDialog( View* parent, const char* name,const QString& formulaName=0); + FormulaDialog( View* tqparent, const char* name,const TQString& formulaName=0); ~FormulaDialog(); private: /** * Turns the @p text into a parameter that koscript can understand. The type * of this parameter is extracted by looking at parameter number @p param in @ref #m_desc. */ - QString createParameter( const QString& _text, int param ); + TQString createParameter( const TQString& _text, int param ); /** * Reads the text out of @ref #firstElement and friends and creates a parameter * list for the function. */ - QString createFormula(); + TQString createFormula(); private slots: /** @@ -78,27 +79,27 @@ private slots: * Called if a function name was selected but not double clicked. * This will just show the help page for the function. */ - void slotSelected( const QString& function ); + void slotSelected( const TQString& function ); /** * Called if the user clicked on one of the "related function" * This will switch the active function and show help page * of the function as well. */ - void slotShowFunction( const QString& function ); + void slotShowFunction( const TQString& function ); /** * Called if the user double clicked on some method name. * That will switch into editing mode, allowing the user * to enter the parameters for the function. */ - void slotDoubleClicked( QListBoxItem* item ); + void slotDoubleClicked( TQListBoxItem* item ); /** * Called if a category of methods has been selected. */ - void slotActivated(const QString& category ); + void slotActivated(const TQString& category ); /** * Called if the text of @ref #firstElement, @ref #secondElement etc. changes. */ - void slotChangeText(const QString& text ); + void slotChangeText(const TQString& text ); /** * Connected to @ref View to get notified if the selection in the * sheet changes. @@ -112,7 +113,7 @@ private slots: /** * Called if the user changes some character in @ref #searchFunct. */ - void slotSearchText(const QString& text ); + void slotSearchText(const TQString& text ); /** * Called if the user pressed return in @ref #searchFunct. */ @@ -122,50 +123,50 @@ public: /** * Find out which widget got focus. */ - bool eventFilter( QObject* obj, QEvent* ev ); + bool eventFilter( TQObject* obj, TQEvent* ev ); protected: - virtual void closeEvent ( QCloseEvent * ); + virtual void closeEvent ( TQCloseEvent * ); private: View* m_pView; - QTabWidget* m_tabwidget; - QTextBrowser* m_browser; - QWidget* m_input; + TQTabWidget* m_tabwidget; + TQTextBrowser* m_browser; + TQWidget* m_input; - QPushButton *selectFunction; - QComboBox *typeFunction; - QListBox *functions; - QLineEdit *result; + TQPushButton *selectFunction; + TQComboBox *typeFunction; + TQListBox *functions; + TQLineEdit *result; KLineEdit *searchFunct; KCompletion listFunct; - QLabel* label1; - QLabel* label2; - QLabel* label3; - QLabel* label4; - QLabel* label5; - QLineEdit *firstElement; - QLineEdit *secondElement; - QLineEdit *thirdElement; - QLineEdit *fourElement; - QLineEdit *fiveElement; + TQLabel* label1; + TQLabel* label2; + TQLabel* label3; + TQLabel* label4; + TQLabel* label5; + TQLineEdit *firstElement; + TQLineEdit *secondElement; + TQLineEdit *thirdElement; + TQLineEdit *fourElement; + TQLineEdit *fiveElement; /** * Tells which of the lineedits has the logical focus currently. * It may happen that a lineedit does not have qt focus but * logical focus but not the other way round. */ - QLineEdit* m_focus; + TQLineEdit* m_focus; int m_column; int m_row; - QString m_oldText; + TQString m_oldText; - QString m_funcName; - QString m_sheetName; + TQString m_funcName; + TQString m_sheetName; - QString m_rightText; - QString m_leftText; + TQString m_rightText; + TQString m_leftText; /** * A lock for @ref #slotChangeText. */ diff --git a/kspread/dialogs/kspread_dlg_goalseek.cc b/kspread/dialogs/kspread_dlg_goalseek.cc index a87ad3eff..beae8437d 100644 --- a/kspread/dialogs/kspread_dlg_goalseek.cc +++ b/kspread/dialogs/kspread_dlg_goalseek.cc @@ -42,22 +42,22 @@ #include <kstdguiitem.h> #include <kpushbutton.h> -#include <qframe.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qtooltip.h> -#include <qvariant.h> -#include <qwhatsthis.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqtooltip.h> +#include <tqvariant.h> +#include <tqwhatsthis.h> #include <math.h> using namespace KSpread; -GoalSeekDialog::GoalSeekDialog( View * parent, QPoint const & marker, +GoalSeekDialog::GoalSeekDialog( View * tqparent, TQPoint const & marker, const char * name, bool, WFlags fl ) - : KDialog( parent, name, false, fl ), - m_pView( parent ), + : KDialog( tqparent, name, false, fl ), + m_pView( tqparent ), m_maxIter( 1000 ), m_restored( true ), m_focus(0), @@ -65,7 +65,7 @@ GoalSeekDialog::GoalSeekDialog( View * parent, QPoint const & marker, m_marker( m_pView->selectionInfo()->marker() ), m_selection( m_pView->selectionInfo()->selection() ) { - setWFlags( Qt::WDestructiveClose ); + setWFlags( TQt::WDestructiveClose ); if ( !name ) setName( "GoalSeekDialog" ); @@ -74,41 +74,41 @@ GoalSeekDialog::GoalSeekDialog( View * parent, QPoint const & marker, setCaption( i18n( "Goal Seek" ) ); setSizeGripEnabled( true ); - GoalSeekDialogLayout = new QGridLayout( this, 1, 1, 11, 6, "GoalSeekDialogLayout"); + GoalSeekDialogLayout = new TQGridLayout( this, 1, 1, 11, 6, "GoalSeekDialogLayout"); - m_startFrame = new QFrame( this, "m_startFrame" ); - m_startFrame->setFrameShape( QFrame::StyledPanel ); - m_startFrame->setFrameShadow( QFrame::Raised ); - m_startFrameLayout = new QGridLayout( m_startFrame, 1, 1, 11, 6, "m_startFrameLayout"); + m_startFrame = new TQFrame( this, "m_startFrame" ); + m_startFrame->setFrameShape( TQFrame::StyledPanel ); + m_startFrame->setFrameShadow( TQFrame::Raised ); + m_startFrameLayout = new TQGridLayout( m_startFrame, 1, 1, 11, 6, "m_startFrameLayout"); - QLabel * TextLabel4 = new QLabel( m_startFrame, "TextLabel4" ); + TQLabel * TextLabel4 = new TQLabel( m_startFrame, "TextLabel4" ); TextLabel4->setText( i18n( "To value:" ) ); m_startFrameLayout->addWidget( TextLabel4, 1, 0 ); - m_targetValueEdit = new QLineEdit( m_startFrame, "m_targetValueEdit" ); + m_targetValueEdit = new TQLineEdit( m_startFrame, "m_targetValueEdit" ); m_startFrameLayout->addWidget( m_targetValueEdit, 1, 1 ); - m_targetEdit = new QLineEdit( m_startFrame, "m_targetEdit" ); + m_targetEdit = new TQLineEdit( m_startFrame, "m_targetEdit" ); m_startFrameLayout->addWidget( m_targetEdit, 0, 1 ); m_targetEdit->setText( Cell::name( marker.x(), marker.y() ) ); - m_sourceEdit = new QLineEdit( m_startFrame, "m_sourceEdit" ); + m_sourceEdit = new TQLineEdit( m_startFrame, "m_sourceEdit" ); m_startFrameLayout->addWidget( m_sourceEdit, 2, 1 ); - QLabel * TextLabel5 = new QLabel( m_startFrame, "TextLabel5" ); + TQLabel * TextLabel5 = new TQLabel( m_startFrame, "TextLabel5" ); TextLabel5->setText( i18n( "By changing cell:" ) ); m_startFrameLayout->addWidget( TextLabel5, 2, 0 ); - QLabel * TextLabel3 = new QLabel( m_startFrame, "TextLabel3" ); + TQLabel * TextLabel3 = new TQLabel( m_startFrame, "TextLabel3" ); TextLabel3->setText( i18n( "Set cell:" ) ); m_startFrameLayout->addWidget( TextLabel3, 0, 0 ); GoalSeekDialogLayout->addWidget( m_startFrame, 0, 0 ); - QVBoxLayout * Layout5 = new QVBoxLayout( 0, 0, 6, "Layout5"); + TQVBoxLayout * Layout5 = new TQVBoxLayout( 0, 0, 6, "Layout5"); - m_buttonOk = new QPushButton( this, "m_buttonOk" ); + m_buttonOk = new TQPushButton( this, "m_buttonOk" ); m_buttonOk->setText( i18n( "&Start" ) ); m_buttonOk->setAccel( 276824143 ); m_buttonOk->setAutoDefault( TRUE ); @@ -119,40 +119,40 @@ GoalSeekDialog::GoalSeekDialog( View * parent, QPoint const & marker, m_buttonCancel->setAccel( 276824131 ); m_buttonCancel->setAutoDefault( TRUE ); Layout5->addWidget( m_buttonCancel ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); Layout5->addItem( spacer ); GoalSeekDialogLayout->addMultiCellLayout( Layout5, 0, 1, 1, 1 ); - m_resultFrame = new QFrame( this, "m_resultFrame" ); - m_resultFrame->setFrameShape( QFrame::StyledPanel ); - m_resultFrame->setFrameShadow( QFrame::Raised ); + m_resultFrame = new TQFrame( this, "m_resultFrame" ); + m_resultFrame->setFrameShape( TQFrame::StyledPanel ); + m_resultFrame->setFrameShadow( TQFrame::Raised ); m_resultFrame->setMinimumWidth( 350 ); - m_resultFrameLayout = new QGridLayout( m_resultFrame, 1, 1, 11, 6, "m_resultFrameLayout"); + m_resultFrameLayout = new TQGridLayout( m_resultFrame, 1, 1, 11, 6, "m_resultFrameLayout"); - m_currentValueLabel = new QLabel( m_resultFrame, "m_currentValueLabel" ); + m_currentValueLabel = new TQLabel( m_resultFrame, "m_currentValueLabel" ); m_currentValueLabel->setText( i18n( "Current value:" ) ); m_resultFrameLayout->addWidget( m_currentValueLabel, 2, 0 ); - m_newValueDesc = new QLabel( m_resultFrame, "m_newValueDesc" ); + m_newValueDesc = new TQLabel( m_resultFrame, "m_newValueDesc" ); m_newValueDesc->setText( i18n( "New value:" ) ); m_resultFrameLayout->addWidget( m_newValueDesc, 1, 0 ); - m_newValue = new QLabel( m_resultFrame, "m_newValue" ); + m_newValue = new TQLabel( m_resultFrame, "m_newValue" ); m_newValue->setText( "m_targetValueEdit" ); m_resultFrameLayout->addWidget( m_newValue, 1, 1 ); - m_currentValue = new QLabel( m_resultFrame, "m_currentValue" ); + m_currentValue = new TQLabel( m_resultFrame, "m_currentValue" ); m_currentValue->setText( "m_currentValue" ); m_resultFrameLayout->addWidget( m_currentValue, 2, 1 ); - m_resultText = new QLabel( m_resultFrame, "m_resultText" ); + m_resultText = new TQLabel( m_resultFrame, "m_resultText" ); m_resultText->setText( "Goal seeking with cell <cell> found <a | no> solution:" ); - m_resultText->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter ) ); + m_resultText->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); m_resultFrameLayout->addMultiCellWidget( m_resultText, 0, 0, 0, 1 ); @@ -165,14 +165,14 @@ GoalSeekDialog::GoalSeekDialog( View * parent, QPoint const & marker, // Allow the user to select cells on the spreadsheet. m_pView->canvasWidget()->startChoose(); - qApp->installEventFilter( this ); + tqApp->installEventFilter( this ); // signals and slots connections - connect( m_buttonOk, SIGNAL( clicked() ), this, SLOT( buttonOkClicked() ) ); - connect( m_buttonCancel, SIGNAL( clicked() ), this, SLOT( buttonCancelClicked() ) ); + connect( m_buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( buttonOkClicked() ) ); + connect( m_buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( buttonCancelClicked() ) ); - connect( m_pView->choice(), SIGNAL(changed(const Region&)), - this, SLOT(slotSelectionChanged())); + connect( m_pView->choice(), TQT_SIGNAL(changed(const Region&)), + this, TQT_SLOT(slotSelectionChanged())); // tab order setTabOrder( m_targetEdit, m_targetValueEdit ); @@ -195,13 +195,13 @@ GoalSeekDialog::~GoalSeekDialog() } } -bool GoalSeekDialog::eventFilter( QObject* obj, QEvent* ev ) +bool GoalSeekDialog::eventFilter( TQObject* obj, TQEvent* ev ) { - if ( obj == m_targetValueEdit && ev->type() == QEvent::FocusIn ) + if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_targetValueEdit) && ev->type() == TQEvent::FocusIn ) m_focus = m_targetValueEdit; - else if ( obj == m_targetEdit && ev->type() == QEvent::FocusIn ) + else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_targetEdit) && ev->type() == TQEvent::FocusIn ) m_focus = m_targetEdit; - else if ( obj == m_sourceEdit && ev->type() == QEvent::FocusIn ) + else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_sourceEdit) && ev->type() == TQEvent::FocusIn ) m_focus = m_sourceEdit; else return FALSE; @@ -212,7 +212,7 @@ bool GoalSeekDialog::eventFilter( QObject* obj, QEvent* ev ) return FALSE; } -void GoalSeekDialog::closeEvent ( QCloseEvent * e ) +void GoalSeekDialog::closeEvent ( TQCloseEvent * e ) { e->accept(); } @@ -224,7 +224,7 @@ void GoalSeekDialog::slotSelectionChanged() if (m_pView->choice()->isValid()) { - QString area = m_pView->choice()->name(); + TQString area = m_pView->choice()->name(); m_focus->setText( area ); } } @@ -315,7 +315,7 @@ void GoalSeekDialog::buttonOkClicked() if ( !pDoc->undoLocked() ) { UndoSetText * undo - = new UndoSetText( pDoc, m_pView->activeSheet(), QString::number(m_oldSource), + = new UndoSetText( pDoc, m_pView->activeSheet(), TQString::number(m_oldSource), m_sourceCell->column(), m_sourceCell->row(), m_sourceCell->formatType() ); @@ -363,7 +363,7 @@ void GoalSeekDialog::chooseCleanup() sheet = m_pView->activeSheet(); // Revert the marker to its original position - m_pView->selectionInfo()->initialize(QRect(m_marker, m_anchor));//, sheet ); + m_pView->selectionInfo()->initialize(TQRect(m_marker, m_anchor));//, sheet ); } @@ -447,7 +447,7 @@ void GoalSeekDialog::startCalc(double _start, double _goal) --m_maxIter; if ( m_maxIter % 20 == 0 ) - m_newValue->setText( QString::number(m_maxIter) ); + m_newValue->setText( TQString::number(m_maxIter) ); } m_newValueDesc->setText( i18n( "New value:" ) ); @@ -459,7 +459,7 @@ void GoalSeekDialog::startCalc(double _start, double _goal) // m_targetCell->setCalcDirtyFlag(); m_targetCell->calc( false ); - m_resultText->setText( i18n( "Goal seeking with cell %1 found a solution:" ).arg( m_sourceEdit->text() ) ); + m_resultText->setText( i18n( "Goal seeking with cell %1 found a solution:" ).tqarg( m_sourceEdit->text() ) ); m_newValue->setText( m_pView->doc()->locale()->formatNumber( startA ) ); m_currentValue->setText( m_pView->doc()->locale()->formatNumber( m_oldSource ) ); m_restored = false; @@ -471,7 +471,7 @@ void GoalSeekDialog::startCalc(double _start, double _goal) m_targetCell->setCalcDirtyFlag(); m_sourceCell->sheet()->setRegionPaintDirty(m_sourceCell->cellRect()); m_targetCell->calc( false ); - m_resultText->setText( i18n( "Goal seeking with cell %1 has found NO solution." ).arg( m_sourceEdit->text() ) ); + m_resultText->setText( i18n( "Goal seeking with cell %1 has found NO solution." ).tqarg( m_sourceEdit->text() ) ); m_newValue->setText( "" ); m_currentValue->setText( m_pView->doc()->locale()->formatNumber( m_oldSource ) ); m_restored = true; diff --git a/kspread/dialogs/kspread_dlg_goalseek.h b/kspread/dialogs/kspread_dlg_goalseek.h index 966bcf170..b3b01f199 100644 --- a/kspread/dialogs/kspread_dlg_goalseek.h +++ b/kspread/dialogs/kspread_dlg_goalseek.h @@ -27,16 +27,16 @@ #define __kspread_dlg_goalseek__ #include <kdialog.h> -#include <qpoint.h> -#include <qrect.h> +#include <tqpoint.h> +#include <tqrect.h> -class QFrame; -class QGridLayout; -class QHBoxLayout; -class QLabel; -class QLineEdit; -class QPushButton; -class QVBoxLayout; +class TQFrame; +class TQGridLayout; +class TQHBoxLayout; +class TQLabel; +class TQLineEdit; +class TQPushButton; +class TQVBoxLayout; namespace KSpread { @@ -48,16 +48,17 @@ class View; class GoalSeekDialog : public KDialog { Q_OBJECT + TQ_OBJECT public: - GoalSeekDialog( View * parent, QPoint const & marker, const char * name = 0, + GoalSeekDialog( View * tqparent, TQPoint const & marker, const char * name = 0, bool modal = FALSE, WFlags fl = 0 ); ~GoalSeekDialog(); /** * Find out which widget got focus. */ - bool eventFilter( QObject* obj, QEvent* ev ); + bool eventFilter( TQObject* obj, TQEvent* ev ); public slots: void buttonOkClicked(); @@ -65,11 +66,11 @@ class GoalSeekDialog : public KDialog void slotSelectionChanged(); protected: - virtual void closeEvent ( QCloseEvent * ); + virtual void closeEvent ( TQCloseEvent * ); - QGridLayout * GoalSeekDialogLayout; - QGridLayout * m_startFrameLayout; - QGridLayout * m_resultFrameLayout; + TQGridLayout * GoalSeekDialogLayout; + TQGridLayout * m_startFrameLayout; + TQGridLayout * m_resultFrameLayout; private: View * m_pView; @@ -80,32 +81,32 @@ class GoalSeekDialog : public KDialog bool m_restored; double m_oldSource; - QString m_oldText; - QString m_sheetName; - - QFrame * m_startFrame; - QLineEdit * m_targetValueEdit; - QLineEdit * m_targetEdit; - QLineEdit * m_sourceEdit; - QPushButton * m_buttonOk; - QPushButton * m_buttonCancel; - QFrame * m_resultFrame; - QLabel * m_newValueDesc; - QLabel * m_currentValueLabel; - QLabel * m_newValue; - QLabel * m_currentValue; - QLabel * m_resultText; + TQString m_oldText; + TQString m_sheetName; + + TQFrame * m_startFrame; + TQLineEdit * m_targetValueEdit; + TQLineEdit * m_targetEdit; + TQLineEdit * m_sourceEdit; + TQPushButton * m_buttonOk; + TQPushButton * m_buttonCancel; + TQFrame * m_resultFrame; + TQLabel * m_newValueDesc; + TQLabel * m_currentValueLabel; + TQLabel * m_newValue; + TQLabel * m_currentValue; + TQLabel * m_resultText; /** * Tells which of the lineedits has the logical focus currently. * It may happen that a lineedit does not have qt focus but * logical focus but not the other way round. */ - QLineEdit * m_focus; + TQLineEdit * m_focus; - QPoint m_anchor; - QPoint m_marker; - QRect m_selection; + TQPoint m_anchor; + TQPoint m_marker; + TQRect m_selection; void startCalc(double _start, double _goal); void chooseCleanup(); diff --git a/kspread/dialogs/kspread_dlg_goto.cc b/kspread/dialogs/kspread_dlg_goto.cc index 12117e361..457dc80c3 100644 --- a/kspread/dialogs/kspread_dlg_goto.cc +++ b/kspread/dialogs/kspread_dlg_goto.cc @@ -22,8 +22,8 @@ * Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <klineedit.h> @@ -38,15 +38,15 @@ using namespace KSpread; -GotoDialog::GotoDialog( View* parent, const char* name ) - : KDialogBase( parent, name, TRUE, i18n("Goto Cell"), Ok|Cancel ) +GotoDialog::GotoDialog( View* tqparent, const char* name ) + : KDialogBase( tqparent, name, TRUE, i18n("Goto Cell"), Ok|Cancel ) { - m_pView = parent; - QWidget *page = new QWidget( this ); + m_pView = tqparent; + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QVBoxLayout *lay1 = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); - QLabel *label = new QLabel(i18n("Enter cell:"), page); + TQLabel *label = new TQLabel(i18n("Enter cell:"), page); lay1->addWidget(label); m_nameCell = new KLineEdit( page ); @@ -55,12 +55,12 @@ GotoDialog::GotoDialog( View* parent, const char* name ) m_nameCell->setFocus(); enableButtonOK( false ); - connect( this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) ); - connect( m_nameCell, SIGNAL(textChanged ( const QString & )), - this, SLOT(textChanged ( const QString & ))); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect( m_nameCell, TQT_SIGNAL(textChanged ( const TQString & )), + this, TQT_SLOT(textChanged ( const TQString & ))); } -void GotoDialog::textChanged ( const QString &_text ) +void GotoDialog::textChanged ( const TQString &_text ) { enableButtonOK(!_text.isEmpty()); } @@ -69,7 +69,7 @@ void GotoDialog::slotOk() { m_pView->doc()->emitBeginOperation( false ); - QString tmp_upper; + TQString tmp_upper; tmp_upper=m_nameCell->text().upper(); Region region(m_pView, tmp_upper); if ( region.isValid() ) diff --git a/kspread/dialogs/kspread_dlg_goto.h b/kspread/dialogs/kspread_dlg_goto.h index 7237f575a..702269717 100644 --- a/kspread/dialogs/kspread_dlg_goto.h +++ b/kspread/dialogs/kspread_dlg_goto.h @@ -37,12 +37,13 @@ class View; class GotoDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GotoDialog( View* parent, const char* name); + GotoDialog( View* tqparent, const char* name); public slots: void slotOk(); - void textChanged ( const QString &_text ); + void textChanged ( const TQString &_text ); protected: diff --git a/kspread/dialogs/kspread_dlg_insert.cc b/kspread/dialogs/kspread_dlg_insert.cc index 3685c1a62..1cca23ca5 100644 --- a/kspread/dialogs/kspread_dlg_insert.cc +++ b/kspread/dialogs/kspread_dlg_insert.cc @@ -24,10 +24,10 @@ * Boston, MA 02110-1301, USA. */ -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlayout.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlayout.h> #include <kbuttonbox.h> #include <kdebug.h> @@ -42,36 +42,36 @@ using namespace KSpread; -InsertDialog::InsertDialog( View* parent, const char* name,const QRect &_rect,Mode _mode) - : KDialogBase( parent, name, TRUE,"",Ok|Cancel ) +InsertDialog::InsertDialog( View* tqparent, const char* name,const TQRect &_rect,Mode _mode) + : KDialogBase( tqparent, name, TRUE,"",Ok|Cancel ) { - m_pView = parent; + m_pView = tqparent; rect=_rect; insRem=_mode; - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QVBoxLayout *lay1 = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); - QButtonGroup *grp = new QButtonGroup( 1, QGroupBox::Horizontal, i18n("Insert"),page); + TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page); grp->setRadioButtonExclusive( TRUE ); - grp->layout(); + grp->tqlayout(); lay1->addWidget(grp); if( insRem==Insert) { - rb1 = new QRadioButton( i18n("Move towards right"), grp ); - rb2 = new QRadioButton( i18n("Move towards bottom"), grp ); - rb3 = new QRadioButton( i18n("Insert rows"), grp ); - rb4 = new QRadioButton( i18n("Insert columns"), grp ); + rb1 = new TQRadioButton( i18n("Move towards right"), grp ); + rb2 = new TQRadioButton( i18n("Move towards bottom"), grp ); + rb3 = new TQRadioButton( i18n("Insert rows"), grp ); + rb4 = new TQRadioButton( i18n("Insert columns"), grp ); setCaption( i18n("Insert Cells") ); } else if(insRem==Remove) { grp->setTitle(i18n("Remove")); - rb1 = new QRadioButton( i18n("Move towards left"), grp ); - rb2 = new QRadioButton( i18n("Move towards top"), grp ); - rb3 = new QRadioButton( i18n("Remove rows"), grp ); - rb4 = new QRadioButton( i18n("Remove columns"), grp ); + rb1 = new TQRadioButton( i18n("Move towards left"), grp ); + rb2 = new TQRadioButton( i18n("Move towards top"), grp ); + rb3 = new TQRadioButton( i18n("Remove rows"), grp ); + rb4 = new TQRadioButton( i18n("Remove columns"), grp ); setCaption( i18n("Remove Cells") ); } else @@ -80,7 +80,7 @@ InsertDialog::InsertDialog( View* parent, const char* name,const QRect &_rect,Mo rb1->setChecked(true); - connect( this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) ); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); } void InsertDialog::slotOk() diff --git a/kspread/dialogs/kspread_dlg_insert.h b/kspread/dialogs/kspread_dlg_insert.h index 29fa4e221..27a961acf 100644 --- a/kspread/dialogs/kspread_dlg_insert.h +++ b/kspread/dialogs/kspread_dlg_insert.h @@ -29,9 +29,9 @@ #include <kdialogbase.h> -class QCheckBox; -class QRadioButton; -class QRect; +class TQCheckBox; +class TQRadioButton; +class TQRect; namespace KSpread { @@ -41,10 +41,11 @@ class View; class InsertDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum Mode { Insert, Remove }; - InsertDialog( View* parent, const char* name, const QRect &_rect, Mode _mode ); + InsertDialog( View* tqparent, const char* name, const TQRect &_rect, Mode _mode ); public slots: void slotOk(); @@ -52,11 +53,11 @@ public slots: private: View* m_pView; - QRadioButton *rb1; - QRadioButton *rb2; - QRadioButton *rb3; - QRadioButton *rb4; - QRect rect; + TQRadioButton *rb1; + TQRadioButton *rb2; + TQRadioButton *rb3; + TQRadioButton *rb4; + TQRect rect; Mode insRem; }; diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc index e86e32719..6b5c233b8 100644 --- a/kspread/dialogs/kspread_dlg_layout.cc +++ b/kspread/dialogs/kspread_dlg_layout.cc @@ -32,16 +32,16 @@ #include <stdlib.h> #include <math.h> -#include <qbitmap.h> -#include <qcheckbox.h> -#include <qframe.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlistbox.h> -#include <qfontdatabase.h> -#include <qradiobutton.h> -#include <qslider.h> -#include <qwhatsthis.h> +#include <tqbitmap.h> +#include <tqcheckbox.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlistbox.h> +#include <tqfontdatabase.h> +#include <tqradiobutton.h> +#include <tqslider.h> +#include <tqwhatsthis.h> #include <kcolorbutton.h> #include <kcombobox.h> @@ -73,22 +73,22 @@ using namespace KSpread; * ***************************************************************************/ -PatternSelect::PatternSelect( QWidget *parent, const char * ) - : QFrame( parent ) +PatternSelect::PatternSelect( TQWidget *tqparent, const char * ) + : TQFrame( tqparent ) { - penStyle = NoPen; + penStyle = Qt::NoPen; penWidth = 1; - penColor = colorGroup().text(); + penColor = tqcolorGroup().text(); selected = false; undefined = false; } -void PatternSelect::setPattern( const QColor &_color, int _width, PenStyle _style ) +void PatternSelect::setPattern( const TQColor &_color, int _width, Qt::PenStyle _style ) { penStyle = _style; penColor = _color; penWidth = _width; - repaint(); + tqrepaint(); } void PatternSelect::setUndefined() @@ -96,15 +96,15 @@ void PatternSelect::setUndefined() undefined = true; } -void PatternSelect::paintEvent( QPaintEvent *_ev ) +void PatternSelect::paintEvent( TQPaintEvent *_ev ) { - QFrame::paintEvent( _ev ); + TQFrame::paintEvent( _ev ); - QPainter painter( this ); + TQPainter painter( this ); if ( !undefined ) { - QPen pen( penColor, penWidth, penStyle); + TQPen pen( penColor, penWidth, penStyle); painter.setPen( pen ); painter.drawLine( 6, height()/2, width() - 6,height()/2 ); } @@ -114,7 +114,7 @@ void PatternSelect::paintEvent( QPaintEvent *_ev ) } } -void PatternSelect::mousePressEvent( QMouseEvent * ) +void PatternSelect::mousePressEvent( TQMouseEvent * ) { slotSelect(); @@ -126,8 +126,8 @@ void PatternSelect::slotUnselect() selected = false; setLineWidth( 1 ); - setFrameStyle( QFrame::Panel | QFrame::Sunken ); - repaint(); + setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); + tqrepaint(); } void PatternSelect::slotSelect() @@ -135,8 +135,8 @@ void PatternSelect::slotSelect() selected = true; setLineWidth( 2 ); - setFrameStyle( QFrame::Panel | QFrame::Plain ); - repaint(); + setFrameStyle( TQFrame::Panel | TQFrame::Plain ); + tqrepaint(); } @@ -147,22 +147,22 @@ void PatternSelect::slotSelect() * ***************************************************************************/ -GeneralTab::GeneralTab( QWidget* parent, CellFormatDialog * dlg ) - : QWidget( parent ), +GeneralTab::GeneralTab( TQWidget* tqparent, CellFormatDialog * dlg ) + : TQWidget( tqparent ), m_dlg( dlg ) { - QGridLayout * layout = new QGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint(), "layout"); + TQGridLayout * tqlayout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint(), "tqlayout"); - QGroupBox * groupBox = new QGroupBox( this, "groupBox1" ); + TQGroupBox * groupBox = new TQGroupBox( this, "groupBox1" ); groupBox->setColumnLayout(0, Qt::Vertical ); groupBox->setTitle( i18n( "Style" ) ); - groupBox->layout()->setSpacing( KDialog::spacingHint() ); - groupBox->layout()->setMargin( KDialog::marginHint() ); + groupBox->tqlayout()->setSpacing( KDialog::spacingHint() ); + groupBox->tqlayout()->setMargin( KDialog::marginHint() ); - QGridLayout * groupBoxLayout = new QGridLayout( groupBox->layout() ); - groupBoxLayout->setAlignment( Qt::AlignTop ); + TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->tqlayout() ); + groupBoxLayout->tqsetAlignment( TQt::AlignTop ); - QLabel * label1 = new QLabel( groupBox, "label1" ); + TQLabel * label1 = new TQLabel( groupBox, "label1" ); label1->setText( i18n( "Name:" ) ); groupBoxLayout->addWidget( label1, 0, 0 ); @@ -170,19 +170,19 @@ GeneralTab::GeneralTab( QWidget* parent, CellFormatDialog * dlg ) m_nameEdit->setText( m_dlg->styleName ); groupBoxLayout->addWidget( m_nameEdit, 0, 1 ); - QLabel * label2 = new QLabel( groupBox, "label2" ); + TQLabel * label2 = new TQLabel( groupBox, "label2" ); label2->setText( i18n( "Inherit style:" ) ); groupBoxLayout->addWidget( label2, 1, 0 ); m_parentBox = new KComboBox( false, groupBox, "m_parentBox" ); m_parentBox->clear(); m_parentBox->insertItem( i18n( "<None>" ) ); - QStringList tmp = m_dlg->getStyleManager()->styleNames(); + TQStringList tmp = m_dlg->getStyleManager()->styleNames(); tmp.remove( m_dlg->styleName ); m_parentBox->insertStringList( tmp ); - if ( m_dlg->getStyle()->parent() ) - m_parentBox->setCurrentText( m_dlg->getStyle()->parentName() ); + if ( m_dlg->getStyle()->tqparent() ) + m_parentBox->setCurrentText( m_dlg->getStyle()->tqparentName() ); else { m_parentBox->setCurrentText( i18n( "<None>" ) ); @@ -191,15 +191,15 @@ GeneralTab::GeneralTab( QWidget* parent, CellFormatDialog * dlg ) m_parentBox->setEnabled( false ); } - connect( m_parentBox, SIGNAL( textChanged( const QString & ) ), this, SLOT( slotNewParent( const QString & ) ) ); - connect( m_nameEdit, SIGNAL( lostFocus() ), this, SLOT( slotNameChanged() ) ); + connect( m_parentBox, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotNewParent( const TQString & ) ) ); + connect( m_nameEdit, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotNameChanged() ) ); groupBoxLayout->addWidget( m_parentBox, 1, 1 ); - QSpacerItem * spacer = new QSpacerItem( 20, 260, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem * spacer = new TQSpacerItem( 20, 260, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - layout->addWidget( groupBox, 0, 0 ); - layout->addItem( spacer, 1, 0 ); + tqlayout->addWidget( groupBox, 0, 0 ); + tqlayout->addItem( spacer, 1, 0 ); if ( m_dlg->getStyle()->type() == Style::BUILTIN ) { @@ -207,7 +207,7 @@ GeneralTab::GeneralTab( QWidget* parent, CellFormatDialog * dlg ) m_parentBox->setEnabled( false ); } - resize( QSize( 534, 447 ).expandedTo(minimumSizeHint()) ); + resize( TQSize( 534, 447 ).expandedTo(tqminimumSizeHint()) ); } GeneralTab::~GeneralTab() @@ -219,18 +219,18 @@ void GeneralTab::slotNameChanged() checkName(); } -void GeneralTab::slotNewParent( const QString & parentName ) +void GeneralTab::slotNewParent( const TQString & tqparentName ) { kdDebug() << "New Parent" << endl; - if ( !checkParent( parentName ) ) + if ( !checkParent( tqparentName ) ) return; - if ( parentName.isEmpty() || parentName == i18n( "<None>" ) ) + if ( tqparentName.isEmpty() || tqparentName == i18n( "<None>" ) ) m_dlg->getStyle()->setParent( 0 ); else - m_dlg->getStyle()->setParent( m_dlg->getStyleManager()->style( parentName ) ); + m_dlg->getStyle()->setParent( m_dlg->getStyleManager()->style( tqparentName ) ); - // Set difference to new parent, set GUI to parent values, add changes made before + // Set difference to new tqparent, set GUI to tqparent values, add changes made before // m_dlg->initGUI(); } @@ -248,29 +248,29 @@ bool GeneralTab::checkName() return true; } -bool GeneralTab::checkParent( const QString & parentName ) +bool GeneralTab::checkParent( const TQString & tqparentName ) { - if ( m_dlg->getStyle()->parentName() != parentName - && m_parentBox->isEnabled() && parentName != i18n( "<None>" ) && !parentName.isEmpty() ) + if ( m_dlg->getStyle()->tqparentName() != tqparentName + && m_parentBox->isEnabled() && tqparentName != i18n( "<None>" ) && !tqparentName.isEmpty() ) { - if ( m_nameEdit->text() == parentName ) + if ( m_nameEdit->text() == tqparentName ) { KMessageBox::sorry( this, i18n( "A style cannot inherit from itself." ) ); return false; } - if ( !m_dlg->checkCircle( m_nameEdit->text(), parentName ) ) + if ( !m_dlg->checkCircle( m_nameEdit->text(), tqparentName ) ) { KMessageBox::sorry( this, i18n( "The style cannot inherit from '%1' because of recursive references." ) - .arg( m_parentBox->currentText() ) ); + .tqarg( m_parentBox->currentText() ) ); return false; } - CustomStyle * p = m_dlg->getStyleManager()->style( parentName ); + CustomStyle * p = m_dlg->getStyleManager()->style( tqparentName ); if ( !p ) { - KMessageBox::sorry( this, i18n( "The parent style does not exist." ) ); + KMessageBox::sorry( this, i18n( "The tqparent style does not exist." ) ); return false; } } @@ -290,7 +290,7 @@ bool GeneralTab::apply( CustomStyle * style ) { if ( style->type() != Style::BUILTIN ) { - QString name( style->name() ); + TQString name( style->name() ); style->setName( m_nameEdit->text() ); if ( m_parentBox->isEnabled() ) { @@ -318,7 +318,7 @@ bool GeneralTab::apply( CustomStyle * style ) ***************************************************************************/ CellFormatDialog::CellFormatDialog( View * _view, Sheet * _sheet ) - : QObject(), + : TQObject(), m_doc( _sheet->doc() ), m_sheet( _sheet ), m_pView( _view ), @@ -330,7 +330,7 @@ CellFormatDialog::CellFormatDialog( View * _view, Sheet * _sheet ) isRowSelected = _view->selectionInfo()->isRowSelected(); isColumnSelected = _view->selectionInfo()->isColumnSelected(); - QRect range = _view->selectionInfo()->selection(); + TQRect range = _view->selectionInfo()->selection(); left = range.left(); top = range.top(); right = range.right(); @@ -430,7 +430,7 @@ CellFormatDialog::CellFormatDialog( View * _view, Sheet * _sheet ) textFontItalic = obj->format()->textFontItalic( left, top ); strike=obj->format()->textFontStrike( left, top ); underline = obj->format()->textFontUnderline( left, top ); - // Needed to initialize the font correctly ( bug in Qt ) + // Needed to initialize the font correctly ( bug in TQt ) textFont = obj->format()->textFont( left, top ); obj->format()->currencyInfo( cCurrency ); @@ -461,7 +461,7 @@ CellFormatDialog::CellFormatDialog( View * _view, Sheet * _sheet ) for ( int x = left; x <= right; x++ ) { cl = m_pView->activeSheet()->columnFormat( x ); - widthSize = QMAX( cl->dblWidth(), widthSize ); + widthSize = TQMAX( cl->dblWidth(), widthSize ); } } @@ -470,7 +470,7 @@ CellFormatDialog::CellFormatDialog( View * _view, Sheet * _sheet ) for ( int y = top; y <= bottom; y++ ) { rl = m_pView->activeSheet()->rowFormat(y); - heightSize = QMAX( rl->dblHeight(), heightSize ); + heightSize = TQMAX( rl->dblHeight(), heightSize ); } } @@ -629,7 +629,7 @@ CellFormatDialog::CellFormatDialog( View * _view, Sheet * _sheet ) CellFormatDialog::CellFormatDialog( View * _view, CustomStyle * _style, StyleManager * _manager, Doc * doc ) - : QObject(), + : TQObject(), m_doc( doc ), m_sheet( 0 ), m_pView( _view ), @@ -696,7 +696,7 @@ void CellFormatDialog::initGUI() strike = ( flags & (uint) Style::FStrike ); underline = ( flags & (uint) Style::FUnderline ); - // Needed to initialize the font correctly ( bug in Qt ) + // Needed to initialize the font correctly ( bug in TQt ) textFont = m_style->font(); cCurrency = m_style->currency(); brushColor = m_style->backGroundBrush().color(); @@ -766,9 +766,9 @@ void CellFormatDialog::initMembers() defaultHeightSize = sheet ? sheet->rowFormat(0)->dblHeight() : 0; } -bool CellFormatDialog::checkCircle( QString const & name, QString const & parent ) +bool CellFormatDialog::checkCircle( TQString const & name, TQString const & tqparent ) { - return m_styleManager->checkCircle( name, parent ); + return m_styleManager->checkCircle( name, tqparent ); } void CellFormatDialog::checkBorderRight(Format *obj,int x,int y) @@ -846,9 +846,9 @@ void CellFormatDialog::initParameters(Format *obj,int x,int y) if ( underline != obj->textFontUnderline( x, y ) ) bUnderline = false; if ( prefix != obj->prefix( x, y ) ) - prefix = QString::null; + prefix = TQString(); if ( postfix != obj->postfix( x, y ) ) - postfix = QString::null; + postfix = TQString(); if ( floatFormat != obj->floatFormat( x, y ) ) bFloatFormat = false; if ( floatColor != obj->floatColor( x, y ) ) @@ -886,20 +886,20 @@ void CellFormatDialog::initParameters(Format *obj,int x,int y) void CellFormatDialog::init() { - QColorGroup colorGroup = QApplication::palette().active(); + TQColorGroup tqcolorGroup = TQApplication::tqpalette().active(); // Did we initialize the bitmaps ? if ( formatOnlyNegSignedPixmap == 0L ) { - QColor black = colorGroup.text(); // not necessarily black :) + TQColor black = tqcolorGroup.text(); // not necessarily black :) formatOnlyNegSignedPixmap = paintFormatPixmap( "123.456", black, "-123.456", black ); - formatRedOnlyNegSignedPixmap = paintFormatPixmap( "123.456", black, "-123.456", Qt::red ); - formatRedNeverSignedPixmap = paintFormatPixmap( "123.456", black, "123.456", Qt::red ); + formatRedOnlyNegSignedPixmap = paintFormatPixmap( "123.456", black, "-123.456", TQt::red ); + formatRedNeverSignedPixmap = paintFormatPixmap( "123.456", black, "123.456", TQt::red ); formatAlwaysSignedPixmap = paintFormatPixmap( "+123.456", black, "-123.456", black ); - formatRedAlwaysSignedPixmap = paintFormatPixmap( "+123.456", black, "-123.456", Qt::red ); + formatRedAlwaysSignedPixmap = paintFormatPixmap( "+123.456", black, "-123.456", TQt::red ); } - tab = new QTabDialog( (QWidget*)m_pView, 0L, true ); + tab = new TQTabDialog( (TQWidget*)m_pView, 0L, true ); //tab->setGeometry( tab->x(), tab->y(), 420, 400 ); if ( m_style ) @@ -936,31 +936,31 @@ void CellFormatDialog::init() tab->adjustSize(); - connect( tab, SIGNAL( applyButtonPressed() ), this, SLOT( slotApply() ) ); + connect( tab, TQT_SIGNAL( applyButtonPressed() ), this, TQT_SLOT( slotApply() ) ); tab->exec(); } -QPixmap * CellFormatDialog::paintFormatPixmap( const char * _string1, const QColor & _color1, - const char *_string2, const QColor & _color2 ) +TQPixmap * CellFormatDialog::paintFormatPixmap( const char * _string1, const TQColor & _color1, + const char *_string2, const TQColor & _color2 ) { - QPixmap * pixmap = new QPixmap( 150, 14 ); + TQPixmap * pixmap = new TQPixmap( 150, 14 ); - QPainter painter; + TQPainter painter; painter.begin( pixmap ); - painter.fillRect( 0, 0, 150, 14, QApplication::palette().active().base() ); + painter.fillRect( 0, 0, 150, 14, TQApplication::tqpalette().active().base() ); painter.setPen( _color1 ); - painter.drawText( 2, 11, _string1 ); + painter.drawText( 2, 11, TQString(_string1) ); painter.setPen( _color2 ); - painter.drawText( 75, 11, _string2 ); + painter.drawText( 75, 11, TQString(_string2) ); painter.end(); - QBitmap bm( pixmap->size() ); + TQBitmap bm( pixmap->size() ); bm.fill( color0 ); painter.begin( &bm ); painter.setPen( color1 ); - painter.drawText( 2, 11, _string1 ); - painter.drawText( 75, 11, _string2 ); + painter.drawText( 2, 11, TQString(_string1) ); + painter.drawText( 75, 11, TQString(_string2) ); painter.end(); pixmap->setMask( bm ); @@ -1078,116 +1078,116 @@ void CellFormatDialog::slotApply() * ***************************************************************************/ -CellFormatPageFloat::CellFormatPageFloat( QWidget* parent, CellFormatDialog *_dlg ) - : QWidget ( parent ), +CellFormatPageFloat::CellFormatPageFloat( TQWidget* tqparent, CellFormatDialog *_dlg ) + : TQWidget ( tqparent ), dlg( _dlg ) { - QVBoxLayout* layout = new QVBoxLayout( this, 6,10 ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6,10 ); - QButtonGroup *grp = new QButtonGroup( i18n("Format"),this); - QGridLayout *grid = new QGridLayout(grp,11,2,KDialog::marginHint(), KDialog::spacingHint()); + TQButtonGroup *grp = new TQButtonGroup( i18n("Format"),this); + TQGridLayout *grid = new TQGridLayout(grp,11,2,KDialog::marginHint(), KDialog::spacingHint()); int fHeight = grp->fontMetrics().height(); grid->addRowSpacing( 0, fHeight/2 ); // groupbox title grp->setRadioButtonExclusive( true ); - generic=new QRadioButton(i18n("Generic"),grp); - QWhatsThis::add(generic, i18n( "This is the default format and KSpread autodetects the actual data type depending on the current cell data. By default, KSpread right justifies numbers, dates and times within a cell and left justifies anything else." ) ); + generic=new TQRadioButton(i18n("Generic"),grp); + TQWhatsThis::add(generic, i18n( "This is the default format and KSpread autodetects the actual data type depending on the current cell data. By default, KSpread right justifies numbers, dates and times within a cell and left justifies anything else." ) ); grid->addWidget(generic,1,0); - number=new QRadioButton(i18n("Number"),grp); - QWhatsThis::add(number, i18n( "The number notation uses the notation you globally choose in KControl -> Regional & Accessibility -> Numbers tab. Numbers are right justified by default." ) ); + number=new TQRadioButton(i18n("Number"),grp); + TQWhatsThis::add(number, i18n( "The number notation uses the notation you globally choose in KControl -> Regional & Accessibility -> Numbers tab. Numbers are right justified by default." ) ); grid->addWidget(number,2,0); - percent=new QRadioButton(i18n("Percent"),grp); - QWhatsThis::add(percent, i18n( "When you have a number in the current cell and you switch from the dcell format from Generic to Percent, the current cell number will be multiplied by 100%.\nFor example if you enter 12 and set the cell format to Percent, the number will then be 1,200 %. Switching back to Generic cell format will bring it back to 12.\nYou can also use the Percent icon in the Format Toolbar." ) ); + percent=new TQRadioButton(i18n("Percent"),grp); + TQWhatsThis::add(percent, i18n( "When you have a number in the current cell and you switch from the dcell format from Generic to Percent, the current cell number will be multiplied by 100%.\nFor example if you enter 12 and set the cell format to Percent, the number will then be 1,200 %. Switching back to Generic cell format will bring it back to 12.\nYou can also use the Percent icon in the Format Toolbar." ) ); grid->addWidget(percent,3,0); - money=new QRadioButton(i18n("Money"),grp); - QWhatsThis::add(money, i18n( "The Money format converts your number into money notation using the settings globally fixed in KControl in Regional & Accessibility -> Money. The currency symbol will be displayed and the precision will be the one set in KControl.\nYou can also use the Currency icon in the Format Toolbar to set the cell formatting to look like your current currency." ) ); + money=new TQRadioButton(i18n("Money"),grp); + TQWhatsThis::add(money, i18n( "The Money format converts your number into money notation using the settings globally fixed in KControl in Regional & Accessibility -> Money. The currency symbol will be displayed and the precision will be the one set in KControl.\nYou can also use the Currency icon in the Format Toolbar to set the cell formatting to look like your current currency." ) ); grid->addWidget(money,4,0); - scientific=new QRadioButton(i18n("Scientific"),grp); - QWhatsThis::add(scientific, i18n( "The scientific format changes your number using the scientific notation. For example, 0.0012 will be changed to 1.2E-03. Going back using Generic cell format will display 0.0012 again." ) ); + scientific=new TQRadioButton(i18n("Scientific"),grp); + TQWhatsThis::add(scientific, i18n( "The scientific format changes your number using the scientific notation. For example, 0.0012 will be changed to 1.2E-03. Going back using Generic cell format will display 0.0012 again." ) ); grid->addWidget(scientific,5,0); - fraction=new QRadioButton(i18n("Fraction"),grp); - QWhatsThis::add(fraction, i18n( "The fraction format changes your number into a fraction. For example, 0.1 can be changed to 1/8, 2/16, 1/10, etc. You define the type of fraction by choosing it in the field on the right. If the exact fraction is not possible in the fraction mode you choose, the nearest closest match is chosen.\n For example: when we have 1.5 as number, we choose Fraction and Sixteenths 1/16 the text displayed into cell is \"1 8/16\" which is an exact fraction. If you have 1.4 as number in your cell and you choose Fraction and Sixteenths 1/16 then the cell will display \"1 6/16\" which is the nearest closest Sixteenth fraction." ) ); + fraction=new TQRadioButton(i18n("Fraction"),grp); + TQWhatsThis::add(fraction, i18n( "The fraction format changes your number into a fraction. For example, 0.1 can be changed to 1/8, 2/16, 1/10, etc. You define the type of fraction by choosing it in the field on the right. If the exact fraction is not possible in the fraction mode you choose, the nearest closest match is chosen.\n For example: when we have 1.5 as number, we choose Fraction and Sixteenths 1/16 the text displayed into cell is \"1 8/16\" which is an exact fraction. If you have 1.4 as number in your cell and you choose Fraction and Sixteenths 1/16 then the cell will display \"1 6/16\" which is the nearest closest Sixteenth fraction." ) ); grid->addWidget(fraction,6,0); - date=new QRadioButton(i18n("Date format"),grp); - QWhatsThis::add(date, i18n( "To enter a date, you should enter it in one of the formats set in KControl in Regional & Accessibility ->Time & Dates. There are two formats set here: the date format and the short date format.\nJust like you can drag down numbers you can also drag down dates and the next cells will also get dates." ) ); + date=new TQRadioButton(i18n("Date format"),grp); + TQWhatsThis::add(date, i18n( "To enter a date, you should enter it in one of the formats set in KControl in Regional & Accessibility ->Time & Dates. There are two formats set here: the date format and the short date format.\nJust like you can drag down numbers you can also drag down dates and the next cells will also get dates." ) ); grid->addWidget(date,7,0); - time=new QRadioButton(i18n("Time format"),grp); - QWhatsThis::add(time, i18n( "This formats your cell content as a time. To enter a time, you should enter it in the Time format set in KControl in Regional & Accessibility ->Time & Dates. In the Cell Format dialog box you can set how the time should be displayed by choosing one of the available time format options. The default format is the system format set in KControl. When the number in the cell does not make sense as a time, KSpread will display 00:00 in the global format you have in KControl." ) ); + time=new TQRadioButton(i18n("Time format"),grp); + TQWhatsThis::add(time, i18n( "This formats your cell content as a time. To enter a time, you should enter it in the Time format set in KControl in Regional & Accessibility ->Time & Dates. In the Cell Format dialog box you can set how the time should be displayed by choosing one of the available time format options. The default format is the system format set in KControl. When the number in the cell does not make sense as a time, KSpread will display 00:00 in the global format you have in KControl." ) ); grid->addWidget(time,8,0); - textFormat=new QRadioButton(i18n("Text"),grp); - QWhatsThis::add(textFormat, i18n( "This formats your cell content as text. This can be useful if you want a number treated as text instead as a number, for example for a ZIP code. Setting a number as text format will left justify it. When numbers are formatted as text, they cannot be used in calculations or formulas. It also change the way the cell is justified." ) ); + textFormat=new TQRadioButton(i18n("Text"),grp); + TQWhatsThis::add(textFormat, i18n( "This formats your cell content as text. This can be useful if you want a number treated as text instead as a number, for example for a ZIP code. Setting a number as text format will left justify it. When numbers are formatted as text, they cannot be used in calculations or formulas. It also change the way the cell is justified." ) ); grid->addWidget(textFormat,9,0); - customFormat=new QRadioButton(i18n("Custom"),grp); - QWhatsThis::add(customFormat, i18n( "The custom format does not work yet. To be enabled in the next release." ) ); + customFormat=new TQRadioButton(i18n("Custom"),grp); + TQWhatsThis::add(customFormat, i18n( "The custom format does not work yet. To be enabled in the next release." ) ); grid->addWidget(customFormat,10,0); customFormat->setEnabled( false ); - QGroupBox *box2 = new QGroupBox( grp, "Box"); + TQGroupBox *box2 = new TQGroupBox( grp, "Box"); box2->setTitle(i18n("Preview")); - QGridLayout *grid3 = new QGridLayout(box2,1,3,KDialog::marginHint(), KDialog::spacingHint()); + TQGridLayout *grid3 = new TQGridLayout(box2,1,3,KDialog::marginHint(), KDialog::spacingHint()); - exampleLabel=new QLabel(box2); - QWhatsThis::add(exampleLabel, i18n( "This will display a preview of your choice so you can know what it does before clicking the OK button to validate it." ) ); + exampleLabel=new TQLabel(box2); + TQWhatsThis::add(exampleLabel, i18n( "This will display a preview of your choice so you can know what it does before clicking the OK button to validate it." ) ); grid3->addWidget(exampleLabel,0,1); grid->addMultiCellWidget(box2,9,10,1,1); - customFormatEdit = new QLineEdit( grp ); + customFormatEdit = new TQLineEdit( grp ); grid->addMultiCellWidget( customFormatEdit, 1, 1, 1, 1 ); customFormatEdit->setHidden( true ); - listFormat=new QListBox(grp); + listFormat=new TQListBox(grp); grid->addMultiCellWidget(listFormat,2,7,1,1); - QWhatsThis::add(listFormat, i18n( "Displays choices of format for the fraction, date or time formats." ) ); - layout->addWidget(grp); + TQWhatsThis::add(listFormat, i18n( "Displays choices of format for the fraction, date or time formats." ) ); + tqlayout->addWidget(grp); /* *** */ - QGroupBox *box = new QGroupBox( this, "Box"); + TQGroupBox *box = new TQGroupBox( this, "Box"); - grid = new QGridLayout(box,3,4,KDialog::marginHint(), KDialog::spacingHint()); + grid = new TQGridLayout(box,3,4,KDialog::marginHint(), KDialog::spacingHint()); - postfix = new QLineEdit( box, "LineEdit_1" ); - QWhatsThis::add(postfix, i18n( "You can add here a Postfix such as a $HK symbol to the end of each cell content in the checked format." ) ); + postfix = new TQLineEdit( box, "LineEdit_1" ); + TQWhatsThis::add(postfix, i18n( "You can add here a Postfix such as a $HK symbol to the end of each cell content in the checked format." ) ); grid->addWidget(postfix,2,1); precision = new KIntNumInput( dlg->precision, box, 10 ); precision->setSpecialValueText(i18n("variable")); precision->setRange(-1,10,1,false); - QWhatsThis::add(precision, i18n( "You can control how many digits are displayed after the decimal point for numeric values. This can also be changed using the Increase precision or Decrease precision icons in the Format toolbar. " ) ); + TQWhatsThis::add(precision, i18n( "You can control how many digits are displayed after the decimal point for numeric values. This can also be changed using the Increase precision or Decrease precision icons in the Format toolbar. " ) ); grid->addWidget(precision,1,1); - prefix = new QLineEdit( box, "LineEdit_3" ); - QWhatsThis::add(prefix, i18n( "You can add here a Prefix such as a $ symbol at the start of each cell content in the checked format." ) ); + prefix = new TQLineEdit( box, "LineEdit_3" ); + TQWhatsThis::add(prefix, i18n( "You can add here a Prefix such as a $ symbol at the start of each cell content in the checked format." ) ); grid->addWidget(prefix,0,1); - format = new QComboBox( box, "ListBox_1" ); - QWhatsThis::add(format, i18n( "You can choose whether positive values are displayed with a leading + sign and whether negative values are shown in red." ) ); + format = new TQComboBox( box, "ListBox_1" ); + TQWhatsThis::add(format, i18n( "You can choose whether positive values are displayed with a leading + sign and whether negative values are shown in red." ) ); grid->addWidget(format,0,3); - QLabel* tmpQLabel; - tmpQLabel = new QLabel( box, "Label_1" ); - grid->addWidget(tmpQLabel,2,0); - tmpQLabel->setText( i18n("Postfix:") ); + TQLabel* tmpTQLabel; + tmpTQLabel = new TQLabel( box, "Label_1" ); + grid->addWidget(tmpTQLabel,2,0); + tmpTQLabel->setText( i18n("Postfix:") ); postfix->setText( dlg->postfix ); - tmpQLabel = new QLabel( box, "Label_2" ); - grid->addWidget(tmpQLabel,0,0); + tmpTQLabel = new TQLabel( box, "Label_2" ); + grid->addWidget(tmpTQLabel,0,0); - tmpQLabel->setText( i18n("Prefix:") ); - tmpQLabel = new QLabel( box, "Label_3" ); - grid->addWidget(tmpQLabel,1,0); - tmpQLabel->setText( i18n("Precision:") ); + tmpTQLabel->setText( i18n("Prefix:") ); + tmpTQLabel = new TQLabel( box, "Label_3" ); + grid->addWidget(tmpTQLabel,1,0); + tmpTQLabel->setText( i18n("Precision:") ); prefix->setText( dlg->prefix ); @@ -1197,22 +1197,22 @@ CellFormatPageFloat::CellFormatPageFloat( QWidget* parent, CellFormatDialog *_dl format->insertItem( *_dlg->formatAlwaysSignedPixmap, 3 ); format->insertItem( *_dlg->formatRedAlwaysSignedPixmap, 4 ); - tmpQLabel = new QLabel( box, "Label_4" ); - grid->addWidget(tmpQLabel, 0, 2); - tmpQLabel->setText( i18n("Format:") ); + tmpTQLabel = new TQLabel( box, "Label_4" ); + grid->addWidget(tmpTQLabel, 0, 2); + tmpTQLabel->setText( i18n("Format:") ); - currencyLabel = new QLabel( box, "LabelCurrency" ); + currencyLabel = new TQLabel( box, "LabelCurrency" ); grid->addWidget(currencyLabel, 1, 2); currencyLabel->setText( i18n("Currency:") ); - currency = new QComboBox( box, "ComboCurrency" ); + currency = new TQComboBox( box, "ComboCurrency" ); grid->addWidget(currency, 1, 3); currency->insertItem( i18n("Automatic") ); int index = 2; //ignore first two in the list bool ok = true; - QString text; + TQString text; while ( ok ) { @@ -1245,7 +1245,7 @@ CellFormatPageFloat::CellFormatPageFloat( QWidget* parent, CellFormatDialog *_dl format->setCurrentItem( 3 ); else if ( dlg->floatFormat == Format::AlwaysSigned && dlg->floatColor == Format::NegRed ) format->setCurrentItem( 4 ); - layout->addWidget(box); + tqlayout->addWidget(box); cellFormatType=dlg->formatType; newFormatType = cellFormatType; @@ -1265,7 +1265,7 @@ CellFormatPageFloat::CellFormatPageFloat( QWidget* parent, CellFormatDialog *_dl currency->show(); if (dlg->bCurrency) { - QString tmp; + TQString tmp; if (dlg->cCurrency.type != 1) { Currency curr(dlg->cCurrency.type); @@ -1293,24 +1293,24 @@ CellFormatPageFloat::CellFormatPageFloat( QWidget* parent, CellFormatDialog *_dl customFormat->setChecked(true); } - connect(generic,SIGNAL(clicked ()),this,SLOT(slotChangeState())); - connect(fraction,SIGNAL(clicked ()),this,SLOT(slotChangeState())); - connect(money,SIGNAL(clicked ()),this,SLOT(slotChangeState())); - connect(date,SIGNAL(clicked ()),this,SLOT(slotChangeState())); - connect(scientific,SIGNAL(clicked ()),this,SLOT(slotChangeState())); - connect(number,SIGNAL(clicked ()),this,SLOT(slotChangeState())); - connect(percent,SIGNAL(clicked ()),this,SLOT(slotChangeState())); - connect(time,SIGNAL(clicked ()),this,SLOT(slotChangeState())); - connect(textFormat,SIGNAL(clicked()),this,SLOT(slotChangeState())); - connect(customFormat,SIGNAL(clicked()),this,SLOT(slotChangeState())); - - connect(listFormat,SIGNAL(selectionChanged ()),this,SLOT(makeformat())); - connect(precision,SIGNAL(valueChanged(int)),this,SLOT(slotChangeValue(int))); - connect(prefix,SIGNAL(textChanged ( const QString & ) ),this,SLOT(makeformat())); - connect(postfix,SIGNAL(textChanged ( const QString & ) ),this,SLOT(makeformat())); - connect(currency,SIGNAL(activated ( const QString & ) ),this, SLOT(currencyChanged(const QString &))); - connect(format,SIGNAL(activated ( int ) ),this,SLOT(formatChanged(int))); - connect(format, SIGNAL(activated(int)), this, SLOT(makeformat())); + connect(generic,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); + connect(fraction,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); + connect(money,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); + connect(date,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); + connect(scientific,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); + connect(number,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); + connect(percent,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); + connect(time,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); + connect(textFormat,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChangeState())); + connect(customFormat,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChangeState())); + + connect(listFormat,TQT_SIGNAL(selectionChanged ()),this,TQT_SLOT(makeformat())); + connect(precision,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotChangeValue(int))); + connect(prefix,TQT_SIGNAL(textChanged ( const TQString & ) ),this,TQT_SLOT(makeformat())); + connect(postfix,TQT_SIGNAL(textChanged ( const TQString & ) ),this,TQT_SLOT(makeformat())); + connect(currency,TQT_SIGNAL(activated ( const TQString & ) ),this, TQT_SLOT(currencyChanged(const TQString &))); + connect(format,TQT_SIGNAL(activated ( int ) ),this,TQT_SLOT(formatChanged(int))); + connect(format, TQT_SIGNAL(activated(int)), this, TQT_SLOT(makeformat())); slotChangeState(); m_bFormatColorChanged=false; m_bFormatTypeChanged=false; @@ -1328,7 +1328,7 @@ void CellFormatPageFloat::slotChangeValue(int) } void CellFormatPageFloat::slotChangeState() { - QStringList list; + TQStringList list; listFormat->clear(); currency->hide(); currencyLabel->hide(); @@ -1402,9 +1402,9 @@ void CellFormatPageFloat::slotChangeState() listFormat->setEnabled(true); - list+=i18n("System: ")+dlg->locale()->formatTime(QTime::currentTime(),false); - list+=i18n("System: ")+dlg->locale()->formatTime(QTime::currentTime(),true); - QDateTime tmpTime (QDate (1, 1, 1900), QTime (10, 35, 25)); + list+=i18n("System: ")+dlg->locale()->formatTime(TQTime::currentTime(),false); + list+=i18n("System: ")+dlg->locale()->formatTime(TQTime::currentTime(),true); + TQDateTime tmpTime (TQDate (1, 1, 1900), TQTime (10, 35, 25)); ValueFormatter *fmt = dlg->getDoc()->formatter(); @@ -1461,12 +1461,12 @@ void CellFormatPageFloat::slotChangeState() void CellFormatPageFloat::init() { - QStringList list; - QString tmp; - QString tmp2; - QDate tmpDate( 2000,2,18); - list+=i18n("System: ")+dlg->locale()->formatDate (QDate::currentDate(), true); - list+=i18n("System: ")+dlg->locale()->formatDate (QDate::currentDate(), false); + TQStringList list; + TQString tmp; + TQString tmp2; + TQDate tmpDate( 2000,2,18); + list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::tqcurrentDate(), true); + list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::tqcurrentDate(), false); ValueFormatter *fmt = dlg->getDoc()->formatter(); @@ -1576,7 +1576,7 @@ void CellFormatPageFloat::init() } -void CellFormatPageFloat::currencyChanged(const QString &) +void CellFormatPageFloat::currencyChanged(const TQString &) { int index = currency->currentItem(); if (index > 0) @@ -1676,10 +1676,10 @@ void CellFormatPageFloat::updateFormatType () void CellFormatPageFloat::makeformat() { m_bFormatTypeChanged=true; - QString tmp; + TQString tmp; updateFormatType(); - QColor color; + TQColor color; Format::FloatFormat floatFormat = Format::OnlyNegSigned; switch( format->currentItem() ) { @@ -1689,11 +1689,11 @@ void CellFormatPageFloat::makeformat() break; case 1: floatFormat = Format::OnlyNegSigned; - color = Qt::red; + color = TQt::red; break; case 2: floatFormat = Format::AlwaysUnsigned; - color = Qt::red; + color = TQt::red; break; case 3: floatFormat = Format::AlwaysSigned; @@ -1701,7 +1701,7 @@ void CellFormatPageFloat::makeformat() break; case 4: floatFormat = Format::AlwaysSigned; - color = Qt::red; + color = TQt::red; break; } if (!dlg->value.isNumber() || dlg->value.asFloat() >= 0 || !format->isEnabled()) @@ -1711,9 +1711,9 @@ void CellFormatPageFloat::makeformat() ValueFormatter *fmt = dlg->getDoc()->formatter(); tmp = fmt->formatText(dlg->value, newFormatType, precision->value(), floatFormat, - prefix->isEnabled() ? prefix->text() : QString::null, - postfix->isEnabled() ? postfix->text() : QString::null, - newFormatType == Money_format ? dlg->cCurrency.symbol : QString::null); + prefix->isEnabled() ? prefix->text() : TQString(), + postfix->isEnabled() ? postfix->text() : TQString(), + newFormatType == Money_format ? dlg->cCurrency.symbol : TQString()); if (tmp.length() > 50) tmp = tmp.left (50); exampleLabel->setText(tmp.prepend("<font color=" + color.name() + ">").append("</font>")); @@ -1881,8 +1881,8 @@ void CellFormatPageFloat::apply(FormatManipulator* _obj) * ***************************************************************************/ -CellFormatPageProtection::CellFormatPageProtection( QWidget* parent, CellFormatDialog * _dlg ) - : ProtectionTab( parent ), +CellFormatPageProtection::CellFormatPageProtection( TQWidget* tqparent, CellFormatDialog * _dlg ) + : ProtectionTab( tqparent ), m_dlg( _dlg ) { m_bDontPrint->setChecked( m_dlg->bDontPrintText ); @@ -1953,19 +1953,19 @@ void CellFormatPageProtection::apply(FormatManipulator* _obj) * ***************************************************************************/ -CellFormatPageFont::CellFormatPageFont( QWidget* parent, CellFormatDialog *_dlg ) : FontTab( parent ) +CellFormatPageFont::CellFormatPageFont( TQWidget* tqparent, CellFormatDialog *_dlg ) : FontTab( tqparent ) { dlg = _dlg; bTextColorUndefined = !dlg->bTextColor; - connect( textColorButton, SIGNAL( changed( const QColor & ) ), - this, SLOT( slotSetTextColor( const QColor & ) ) ); + connect( textColorButton, TQT_SIGNAL( changed( const TQColor & ) ), + this, TQT_SLOT( slotSetTextColor( const TQColor & ) ) ); - QStringList tmpListFont; - QFontDatabase *fontDataBase = new QFontDatabase(); - tmpListFont = fontDataBase->families(); + TQStringList tmpListFont; + TQFontDatabase *fontDataBase = new TQFontDatabase(); + tmpListFont = fontDataBase->tqfamilies(); delete fontDataBase; family_combo->insertStringList( tmpListFont); @@ -1976,13 +1976,13 @@ CellFormatPageFont::CellFormatPageFont( QWidget* parent, CellFormatDialog *_dlg selFont.setFamily( dlg->textFontFamily ); kdDebug(36001) << "Family = " << dlg->textFontFamily << endl; - if ( !family_combo->findItem(dlg->textFontFamily)) + if ( !family_combo->tqfindItem(dlg->textFontFamily)) { family_combo->insertItem("",0); family_combo->setCurrentItem(0); } else - family_combo->setCurrentItem(family_combo->index(family_combo->findItem(dlg->textFontFamily))); + family_combo->setCurrentItem(family_combo->index(family_combo->tqfindItem(dlg->textFontFamily))); } else { @@ -1990,42 +1990,42 @@ CellFormatPageFont::CellFormatPageFont( QWidget* parent, CellFormatDialog *_dlg family_combo->setCurrentItem(0); } - connect( family_combo, SIGNAL(highlighted(const QString &)), - SLOT(family_chosen_slot(const QString &)) ); + connect( family_combo, TQT_SIGNAL(highlighted(const TQString &)), + TQT_SLOT(family_chosen_slot(const TQString &)) ); - QStringList lst; + TQStringList lst; lst.append(""); for ( unsigned int i = 1; i < 100; ++i ) - lst.append( QString( "%1" ).arg( i ) ); + lst.append( TQString( "%1" ).tqarg( i ) ); size_combo->insertStringList( lst ); - size_combo->setInsertionPolicy(QComboBox::NoInsertion); + size_combo->setInsertionPolicy(TQComboBox::NoInsertion); - connect( size_combo, SIGNAL(activated(const QString &)), - SLOT(size_chosen_slot(const QString &)) ); - connect( size_combo ,SIGNAL( textChanged(const QString &)), - this,SLOT(size_chosen_slot(const QString &))); + connect( size_combo, TQT_SIGNAL(activated(const TQString &)), + TQT_SLOT(size_chosen_slot(const TQString &)) ); + connect( size_combo ,TQT_SIGNAL( textChanged(const TQString &)), + this,TQT_SLOT(size_chosen_slot(const TQString &))); - connect( weight_combo, SIGNAL(activated(const QString &)), - SLOT(weight_chosen_slot(const QString &)) ); + connect( weight_combo, TQT_SIGNAL(activated(const TQString &)), + TQT_SLOT(weight_chosen_slot(const TQString &)) ); - connect( style_combo, SIGNAL(activated(const QString &)), - SLOT(style_chosen_slot(const QString &)) ); + connect( style_combo, TQT_SIGNAL(activated(const TQString &)), + TQT_SLOT(style_chosen_slot(const TQString &)) ); strike->setChecked(dlg->strike); - connect( strike, SIGNAL( clicked()), - SLOT(strike_chosen_slot()) ); + connect( strike, TQT_SIGNAL( clicked()), + TQT_SLOT(strike_chosen_slot()) ); underline->setChecked(dlg->underline); - connect( underline, SIGNAL( clicked()), - SLOT(underline_chosen_slot()) ); + connect( underline, TQT_SIGNAL( clicked()), + TQT_SLOT(underline_chosen_slot()) ); example_label->setText(i18n("Dolor Ipse")); - connect(this,SIGNAL(fontSelected( const QFont& )), - this,SLOT(display_example( const QFont&))); + connect(this,TQT_SIGNAL(fontSelected( const TQFont& )), + this,TQT_SLOT(display_example( const TQFont&))); setCombos(); display_example( selFont ); @@ -2033,7 +2033,7 @@ CellFormatPageFont::CellFormatPageFont( QWidget* parent, CellFormatDialog *_dlg this->resize( 400, 400 ); } -void CellFormatPageFont::slotSetTextColor( const QColor &_color ) +void CellFormatPageFont::slotSetTextColor( const TQColor &_color ) { textColor = _color; bTextColorUndefined = false; @@ -2109,23 +2109,23 @@ void CellFormatPageFont::strike_chosen_slot() emit fontSelected(selFont); } -void CellFormatPageFont::family_chosen_slot(const QString & family) +void CellFormatPageFont::family_chosen_slot(const TQString & family) { selFont.setFamily(family); emit fontSelected(selFont); } -void CellFormatPageFont::size_chosen_slot(const QString & size) +void CellFormatPageFont::size_chosen_slot(const TQString & size) { - QString size_string = size; + TQString size_string = size; selFont.setPointSize(size_string.toInt()); emit fontSelected(selFont); } -void CellFormatPageFont::weight_chosen_slot(const QString & weight) +void CellFormatPageFont::weight_chosen_slot(const TQString & weight) { - QString weight_string = weight; + TQString weight_string = weight; if ( weight_string == i18n("Normal")) selFont.setBold(false); @@ -2134,9 +2134,9 @@ void CellFormatPageFont::weight_chosen_slot(const QString & weight) emit fontSelected(selFont); } -void CellFormatPageFont::style_chosen_slot(const QString & style) +void CellFormatPageFont::style_chosen_slot(const TQString & style) { - QString style_string = style; + TQString style_string = style; if ( style_string == i18n("Roman")) selFont.setItalic(false); @@ -2146,28 +2146,28 @@ void CellFormatPageFont::style_chosen_slot(const QString & style) } -void CellFormatPageFont::display_example(const QFont& font) +void CellFormatPageFont::display_example(const TQFont& font) { - QString string; + TQString string; fontChanged=true; example_label->setFont(font); - example_label->repaint(); + example_label->tqrepaint(); } void CellFormatPageFont::setCombos() { - QString string; - QComboBox* combo; + TQString string; + TQComboBox* combo; int number_of_entries; bool found; if ( dlg->bTextColor ) textColor = dlg->textColor; else - textColor = colorGroup().text(); + textColor = tqcolorGroup().text(); if ( !textColor.isValid() ) - textColor =colorGroup().text(); + textColor =tqcolorGroup().text(); textColorButton->setColor( textColor ); @@ -2182,7 +2182,7 @@ void CellFormatPageFont::setCombos() found = false; for (int i = 0; i < number_of_entries ; i++){ - if ( string == (QString) combo->text(i)){ + if ( string == (TQString) combo->text(i)){ combo->setCurrentItem(i); found = true; // kdDebug(36001) << "Found Size " << string.data() << " setting to item " i << endl; @@ -2228,8 +2228,8 @@ void CellFormatPageFont::setCombos() * ***************************************************************************/ -CellFormatPagePosition::CellFormatPagePosition( QWidget* parent, CellFormatDialog *_dlg ) - : PositionTab(parent ), +CellFormatPagePosition::CellFormatPagePosition( TQWidget* tqparent, CellFormatDialog *_dlg ) + : PositionTab(tqparent ), dlg( _dlg ) { if ( dlg->alignX == Format::Left ) @@ -2241,7 +2241,7 @@ CellFormatPagePosition::CellFormatPagePosition( QWidget* parent, CellFormatDialo else if ( dlg->alignX == Format::Undefined ) standard->setChecked( true ); - connect(horizontalGroup, SIGNAL(clicked(int)), this, SLOT(slotStateChanged(int))); + connect(horizontalGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotStateChanged(int))); if ( dlg->alignY ==Format::Top ) top->setChecked( true ); @@ -2265,13 +2265,13 @@ CellFormatPagePosition::CellFormatPagePosition( QWidget* parent, CellFormatDialo mergeCell->setChecked(dlg->isMerged); mergeCell->setEnabled(!dlg->oneCell && ((!dlg->isRowSelected) && (!dlg->isColumnSelected))); - QGridLayout *grid2 = new QGridLayout(indentGroup, 1, 1, KDialog::marginHint(), KDialog::spacingHint()); + TQGridLayout *grid2 = new TQGridLayout(indentGroup, 1, 1, KDialog::marginHint(), KDialog::spacingHint()); grid2->addRowSpacing( 0, indentGroup->fontMetrics().height()/8 ); // groupbox title m_indent = new KoUnitDoubleSpinBox( indentGroup, 0.0, 400.0, 10.0,dlg->indent,dlg->getDoc()->unit() ); grid2->addWidget(m_indent, 0, 0); width = new KoUnitDoubleSpinBox( m_widthPanel ); - QGridLayout *gridWidth = new QGridLayout(m_widthPanel, 1, 1, 0, 0); + TQGridLayout *gridWidth = new TQGridLayout(m_widthPanel, 1, 1, 0, 0); gridWidth->addWidget(width, 0, 0); width->setValue ( dlg->widthSize ); width->setUnit( dlg->getDoc()->unit() ); @@ -2281,12 +2281,12 @@ CellFormatPagePosition::CellFormatPagePosition( QWidget* parent, CellFormatDialo if ( dlg->isRowSelected ) width->setEnabled(false); - defaultWidth->setText(i18n("Default width (%1 %2)").arg(KoUnit::toUserValue(dlg->defaultWidthSize, dlg->getDoc()->unit()), 0, 'f', 2).arg(dlg->getDoc()->unitName())); + defaultWidth->setText(i18n("Default width (%1 %2)").tqarg(KoUnit::toUserValue(dlg->defaultWidthSize, dlg->getDoc()->unit()), 0, 'f', 2).tqarg(dlg->getDoc()->unitName())); if ( dlg->isRowSelected ) defaultWidth->setEnabled(false); height=new KoUnitDoubleSpinBox( m_heightPanel ); - QGridLayout *gridHeight = new QGridLayout(m_heightPanel, 1, 1, 0, 0); + TQGridLayout *gridHeight = new TQGridLayout(m_heightPanel, 1, 1, 0, 0); gridHeight->addWidget(height, 0, 0); height->setValue( dlg->heightSize ); height->setUnit( dlg->getDoc()->unit() ); @@ -2296,7 +2296,7 @@ CellFormatPagePosition::CellFormatPagePosition( QWidget* parent, CellFormatDialo if ( dlg->isColumnSelected ) height->setEnabled(false); - defaultHeight->setText(i18n("Default height (%1 %2)").arg(KoUnit::toUserValue(dlg->defaultHeightSize, dlg->getDoc()->unit()), 0, 'f', 2).arg(dlg->getDoc()->unitName())); //annma + defaultHeight->setText(i18n("Default height (%1 %2)").tqarg(KoUnit::toUserValue(dlg->defaultHeightSize, dlg->getDoc()->unit()), 0, 'f', 2).tqarg(dlg->getDoc()->unitName())); //annma if ( dlg->isColumnSelected ) defaultHeight->setEnabled(false); @@ -2307,11 +2307,11 @@ CellFormatPagePosition::CellFormatPagePosition( QWidget* parent, CellFormatDialo defaultWidth->setEnabled(false); } - connect(defaultWidth , SIGNAL(clicked() ),this, SLOT(slotChangeWidthState())); - connect(defaultHeight , SIGNAL(clicked() ),this, SLOT(slotChangeHeightState())); - connect(vertical , SIGNAL(clicked() ),this, SLOT(slotChangeVerticalState())); - connect(multi , SIGNAL(clicked() ), this, SLOT(slotChangeMultiState())); - connect(angleRotation, SIGNAL(valueChanged(int)), this, SLOT(slotChangeAngle(int))); + connect(defaultWidth , TQT_SIGNAL(clicked() ),this, TQT_SLOT(slotChangeWidthState())); + connect(defaultHeight , TQT_SIGNAL(clicked() ),this, TQT_SLOT(slotChangeHeightState())); + connect(vertical , TQT_SIGNAL(clicked() ),this, TQT_SLOT(slotChangeVerticalState())); + connect(multi , TQT_SIGNAL(clicked() ), this, TQT_SLOT(slotChangeMultiState())); + connect(angleRotation, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChangeAngle(int))); slotStateChanged( 0 ); m_bOptionText = false; @@ -2529,16 +2529,16 @@ double CellFormatPagePosition::getSizeWidth() const * ***************************************************************************/ -BorderButton::BorderButton( QWidget *parent, const char *_name ) : QPushButton(parent,_name) +BorderButton::BorderButton( TQWidget *tqparent, const char *_name ) : TQPushButton(tqparent,_name) { penStyle = Qt::NoPen; penWidth = 1; - penColor = colorGroup().text(); + penColor = tqcolorGroup().text(); setToggleButton( true ); setOn( false); setChanged(false); } -void BorderButton::mousePressEvent( QMouseEvent * ) +void BorderButton::mousePressEvent( TQMouseEvent * ) { this->setOn(!isOn()); @@ -2547,9 +2547,9 @@ void BorderButton::mousePressEvent( QMouseEvent * ) void BorderButton::setUndefined() { - setPenStyle(SolidLine ); + setPenStyle(Qt::SolidLine ); setPenWidth(1); - setColor(colorGroup().midlight()); + setColor(tqcolorGroup().midlight()); } @@ -2558,7 +2558,7 @@ void BorderButton::unselect() setOn(false); setPenWidth(1); setPenStyle(Qt::NoPen); - setColor( colorGroup().text() ); + setColor( tqcolorGroup().text() ); setChanged(true); } @@ -2570,8 +2570,8 @@ void BorderButton::unselect() * ***************************************************************************/ -Border::Border( QWidget *parent, const char *_name,bool _oneCol, bool _oneRow ) - : QFrame( parent, _name ) +Border::Border( TQWidget *tqparent, const char *_name,bool _oneCol, bool _oneRow ) + : TQFrame( tqparent, _name ) { oneCol=_oneCol; oneRow=_oneRow; @@ -2580,13 +2580,13 @@ Border::Border( QWidget *parent, const char *_name,bool _oneCol, bool _oneRow ) #define OFFSETX 5 #define OFFSETY 5 -void Border::paintEvent( QPaintEvent *_ev ) +void Border::paintEvent( TQPaintEvent *_ev ) { - QFrame::paintEvent( _ev ); - QPen pen; - QPainter painter; + TQFrame::paintEvent( _ev ); + TQPen pen; + TQPainter painter; painter.begin( this ); - pen=QPen( colorGroup().midlight(),2,SolidLine); + pen=TQPen( tqcolorGroup().midlight(),2,SolidLine); painter.setPen( pen ); painter.drawLine( OFFSETX-5, OFFSETY, OFFSETX , OFFSETY ); @@ -2617,7 +2617,7 @@ void Border::paintEvent( QPaintEvent *_ev ) emit redraw(); } -void Border::mousePressEvent( QMouseEvent* _ev ) +void Border::mousePressEvent( TQMouseEvent* _ev ) { emit choosearea(_ev); } @@ -2630,8 +2630,8 @@ void Border::mousePressEvent( QMouseEvent* _ev ) * ***************************************************************************/ -CellFormatPageBorder::CellFormatPageBorder( QWidget* parent, CellFormatDialog *_dlg ) - : QWidget( parent ), +CellFormatPageBorder::CellFormatPageBorder( TQWidget* tqparent, CellFormatDialog *_dlg ) + : TQWidget( tqparent ), dlg( _dlg ) { sheet = dlg->getSheet(); @@ -2646,15 +2646,15 @@ CellFormatPageBorder::CellFormatPageBorder( QWidget* parent, CellFormatDialog *_ style->setEnabled(false); size->setEnabled(false); - preview->setPattern( black , 1, SolidLine ); + preview->setPattern( black , 1, Qt::SolidLine ); this->resize( 400, 400 ); } void CellFormatPageBorder::InitializeGrids() { - QGridLayout *grid = new QGridLayout(this,5,2,KDialog::marginHint(), KDialog::spacingHint()); - QGridLayout *grid2 = NULL; - QGroupBox* tmpQGroupBox = NULL; + TQGridLayout *grid = new TQGridLayout(this,5,2,KDialog::marginHint(), KDialog::spacingHint()); + TQGridLayout *grid2 = NULL; + TQGroupBox* tmpTQGroupBox = NULL; /***********************/ /* here is the data to initialize all the border buttons with */ @@ -2664,11 +2664,11 @@ void CellFormatPageBorder::InitializeGrids() const char shortcutButtonNames[BorderShortcutType_END][20] = {"remove", "all", "outline"}; - QString borderButtonIconNames[BorderType_END] = + TQString borderButtonIconNames[BorderType_END] = {"border_top", "border_bottom", "border_left", "border_right", "border_vertical", "border_horizontal", "border_fall", "border_up"}; - QString shortcutButtonIconNames[BorderShortcutType_END] = + TQString shortcutButtonIconNames[BorderShortcutType_END] = { "border_remove", "", "border_outline"}; int borderButtonPositions[BorderType_END][2] = @@ -2678,40 +2678,40 @@ void CellFormatPageBorder::InitializeGrids() { {0,0}, {0,1},{0,2} }; /***********************/ - /* set up a layout box for most of the border setting buttons */ - tmpQGroupBox = new QGroupBox( this, "GroupBox_1" ); - tmpQGroupBox->setFrameStyle( QFrame::Box | QFrame::Sunken ); - tmpQGroupBox->setTitle( i18n("Border") ); - tmpQGroupBox->setAlignment( AlignLeft ); - grid2 = new QGridLayout(tmpQGroupBox,6,5,KDialog::marginHint(), KDialog::spacingHint()); - int fHeight = tmpQGroupBox->fontMetrics().height(); + /* set up a tqlayout box for most of the border setting buttons */ + tmpTQGroupBox = new TQGroupBox( this, "GroupBox_1" ); + tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); + tmpTQGroupBox->setTitle( i18n("Border") ); + tmpTQGroupBox->tqsetAlignment( AlignLeft ); + grid2 = new TQGridLayout(tmpTQGroupBox,6,5,KDialog::marginHint(), KDialog::spacingHint()); + int fHeight = tmpTQGroupBox->fontMetrics().height(); grid2->addRowSpacing( 0, fHeight/2 ); // groupbox title - area=new Border(tmpQGroupBox,"area",dlg->oneCol,dlg->oneRow); + area=new Border(tmpTQGroupBox,"area",dlg->oneCol,dlg->oneRow); grid2->addMultiCellWidget(area,2,4,1,3); - area->setBackgroundColor( colorGroup().base() ); + area->setBackgroundColor( tqcolorGroup().base() ); /* initailize the buttons that are in this box */ for (int i=BorderType_Top; i < BorderType_END; i++) { - borderButtons[i] = new BorderButton(tmpQGroupBox, + borderButtons[i] = new BorderButton(tmpTQGroupBox, borderButtonNames[i]); loadIcon(borderButtonIconNames[i], borderButtons[i]); grid2->addWidget(borderButtons[i], borderButtonPositions[i][0] + 1, borderButtonPositions[i][1]); } - grid->addMultiCellWidget(tmpQGroupBox,0,2,0,0); + grid->addMultiCellWidget(tmpTQGroupBox,0,2,0,0); /* the remove, all, and outline border buttons are in a second box down below.*/ - tmpQGroupBox = new QGroupBox( this, "GroupBox_3" ); - tmpQGroupBox->setFrameStyle( QFrame::Box | QFrame::Sunken ); - tmpQGroupBox->setTitle( i18n("Preselect") ); - tmpQGroupBox->setAlignment( AlignLeft ); + tmpTQGroupBox = new TQGroupBox( this, "GroupBox_3" ); + tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); + tmpTQGroupBox->setTitle( i18n("Preselect") ); + tmpTQGroupBox->tqsetAlignment( AlignLeft ); - grid2 = new QGridLayout(tmpQGroupBox,1,3,KDialog::marginHint(), KDialog::spacingHint()); + grid2 = new TQGridLayout(tmpTQGroupBox,1,3,KDialog::marginHint(), KDialog::spacingHint()); /* the "all" button is different depending on what kind of region is currently selected */ @@ -2730,7 +2730,7 @@ void CellFormatPageBorder::InitializeGrids() for (int i=BorderShortcutType_Remove; i < BorderShortcutType_END; i++) { - shortcutButtons[i] = new BorderButton(tmpQGroupBox, + shortcutButtons[i] = new BorderButton(tmpTQGroupBox, shortcutButtonNames[i]); loadIcon(shortcutButtonIconNames[i], shortcutButtons[i]); grid2->addWidget(shortcutButtons[i], shortcutButtonPositions[i][0], @@ -2742,16 +2742,16 @@ void CellFormatPageBorder::InitializeGrids() shortcutButtons[BorderShortcutType_All]->setEnabled(false); } - grid->addMultiCellWidget(tmpQGroupBox,3,4,0,0); + grid->addMultiCellWidget(tmpTQGroupBox,3,4,0,0); /* now set up the group box with the pattern selector */ - tmpQGroupBox = new QGroupBox( this, "GroupBox_10" ); - tmpQGroupBox->setFrameStyle( QFrame::Box | QFrame::Sunken ); - tmpQGroupBox->setTitle( i18n("Pattern") ); - tmpQGroupBox->setAlignment( AlignLeft ); + tmpTQGroupBox = new TQGroupBox( this, "GroupBox_10" ); + tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); + tmpTQGroupBox->setTitle( i18n("Pattern") ); + tmpTQGroupBox->tqsetAlignment( AlignLeft ); - grid2 = new QGridLayout(tmpQGroupBox,7,2,KDialog::marginHint(), KDialog::spacingHint()); - fHeight = tmpQGroupBox->fontMetrics().height(); + grid2 = new TQGridLayout(tmpTQGroupBox,7,2,KDialog::marginHint(), KDialog::spacingHint()); + fHeight = tmpTQGroupBox->fontMetrics().height(); grid2->addRowSpacing( 0, fHeight/2 ); // groupbox title char name[] = "PatternXX"; @@ -2761,8 +2761,8 @@ void CellFormatPageBorder::InitializeGrids() { name[7] = '0' + (i+1) / 10; name[8] = '0' + (i+1) % 10; - pattern[i] = new PatternSelect( tmpQGroupBox, name ); - pattern[i]->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + pattern[i] = new PatternSelect( tmpTQGroupBox, name ); + pattern[i]->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(pattern[i], i % 5 + 1, i / 5); /* this puts them in the pattern: 1 6 @@ -2773,23 +2773,23 @@ void CellFormatPageBorder::InitializeGrids() */ } - color = new KColorButton (tmpQGroupBox, "PushButton_1" ); + color = new KColorButton (tmpTQGroupBox, "PushButton_1" ); grid2->addWidget(color,7,1); - QLabel *tmpQLabel = new QLabel( tmpQGroupBox, "Label_6" ); - tmpQLabel->setText( i18n("Color:") ); - grid2->addWidget(tmpQLabel,7,0); + TQLabel *tmpTQLabel = new TQLabel( tmpTQGroupBox, "Label_6" ); + tmpTQLabel->setText( i18n("Color:") ); + grid2->addWidget(tmpTQLabel,7,0); /* tack on the 'customize' border pattern selector */ - QGridLayout *grid3 = new QGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); - customize = new QCheckBox(i18n("Customize"),tmpQGroupBox); + TQGridLayout *grid3 = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); + customize = new TQCheckBox(i18n("Customize"),tmpTQGroupBox); grid3->addWidget(customize,0,0); - connect( customize, SIGNAL( clicked()), SLOT(cutomize_chosen_slot()) ); + connect( customize, TQT_SIGNAL( clicked()), TQT_SLOT(cutomize_chosen_slot()) ); - size=new QComboBox(true,tmpQGroupBox); + size=new TQComboBox(true,tmpTQGroupBox); grid3->addWidget(size,1,1); size->setValidator(new KIntValidator( size )); - QString tmp; + TQString tmp; for ( int i=0;i<10;i++) { tmp=tmp.setNum(i); @@ -2797,40 +2797,40 @@ void CellFormatPageBorder::InitializeGrids() } size->setCurrentItem(1); - style=new QComboBox(tmpQGroupBox); + style=new TQComboBox(tmpTQGroupBox); grid3->addWidget(style,1,0); style->insertItem(paintFormatPixmap(DotLine),0 ); style->insertItem(paintFormatPixmap(DashLine) ,1); style->insertItem(paintFormatPixmap(DashDotLine),2 ); style->insertItem(paintFormatPixmap(DashDotDotLine),3 ); style->insertItem(paintFormatPixmap(SolidLine),4); - style->setBackgroundColor( colorGroup().background() ); + style->setBackgroundColor( tqcolorGroup().background() ); grid2->addMultiCell(grid3,6,6,0,1); - grid->addMultiCellWidget(tmpQGroupBox,0,3,1,1); + grid->addMultiCellWidget(tmpTQGroupBox,0,3,1,1); /* Now the preview box is put together */ - tmpQGroupBox = new QGroupBox(this, "GroupBox_4" ); - tmpQGroupBox->setFrameStyle( QFrame::Box | QFrame::Sunken ); - tmpQGroupBox->setTitle( i18n("Preview") ); - tmpQGroupBox->setAlignment( AlignLeft ); + tmpTQGroupBox = new TQGroupBox(this, "GroupBox_4" ); + tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); + tmpTQGroupBox->setTitle( i18n("Preview") ); + tmpTQGroupBox->tqsetAlignment( AlignLeft ); - grid2 = new QGridLayout(tmpQGroupBox,1,1,KDialog::marginHint(), KDialog::spacingHint()); - fHeight = tmpQGroupBox->fontMetrics().height(); + grid2 = new TQGridLayout(tmpTQGroupBox,1,1,KDialog::marginHint(), KDialog::spacingHint()); + fHeight = tmpTQGroupBox->fontMetrics().height(); grid2->addRowSpacing( 0, fHeight/2 ); // groupbox title - preview = new PatternSelect( tmpQGroupBox, "Pattern_preview" ); - preview->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + preview = new PatternSelect( tmpTQGroupBox, "Pattern_preview" ); + preview->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(preview,1,0); - grid->addWidget(tmpQGroupBox,4,1); + grid->addWidget(tmpTQGroupBox,4,1); } void CellFormatPageBorder::InitializeBorderButtons() { for (int i=BorderType_Top; i < BorderType_END; i++) { - if (dlg->borders[i].style != Qt::NoPen || + if (dlg->borders[i].style != TQt::NoPen || !dlg->borders[i].bStyle ) { /* the horozontil and vertical buttons might be disabled depending on what @@ -2859,51 +2859,51 @@ void CellFormatPageBorder::InitializeBorderButtons() void CellFormatPageBorder::InitializePatterns() { - pattern[0]->setPattern( black, 1, DotLine ); - pattern[1]->setPattern( black, 1, DashLine ); - pattern[2]->setPattern( black, 1, SolidLine ); - pattern[3]->setPattern( black, 1, DashDotLine ); - pattern[4]->setPattern( black, 1, DashDotDotLine ); - pattern[5]->setPattern( black, 2, SolidLine ); - pattern[6]->setPattern( black, 3, SolidLine ); - pattern[7]->setPattern( black, 4, SolidLine ); - pattern[8]->setPattern( black, 5, SolidLine ); - pattern[9]->setPattern( black, 1, NoPen ); + pattern[0]->setPattern( black, 1, Qt::DotLine ); + pattern[1]->setPattern( black, 1, Qt::DashLine ); + pattern[2]->setPattern( black, 1, Qt::SolidLine ); + pattern[3]->setPattern( black, 1, Qt::DashDotLine ); + pattern[4]->setPattern( black, 1, Qt::DashDotDotLine ); + pattern[5]->setPattern( black, 2, Qt::SolidLine ); + pattern[6]->setPattern( black, 3, Qt::SolidLine ); + pattern[7]->setPattern( black, 4, Qt::SolidLine ); + pattern[8]->setPattern( black, 5, Qt::SolidLine ); + pattern[9]->setPattern( black, 1, Qt::NoPen ); slotSetColorButton( black ); } void CellFormatPageBorder::SetConnections() { - connect( color, SIGNAL( changed( const QColor & ) ), - this, SLOT( slotSetColorButton( const QColor & ) ) ); + connect( color, TQT_SIGNAL( changed( const TQColor & ) ), + this, TQT_SLOT( slotSetColorButton( const TQColor & ) ) ); for (int i=0; i < NUM_BORDER_PATTERNS; i++) { - connect( pattern[i], SIGNAL( clicked( PatternSelect* ) ), - this, SLOT( slotUnselect2( PatternSelect* ) ) ); + connect( pattern[i], TQT_SIGNAL( clicked( PatternSelect* ) ), + this, TQT_SLOT( slotUnselect2( PatternSelect* ) ) ); } for (int i = BorderType_Top; i < BorderType_END; i++) { - connect( borderButtons[i], SIGNAL( clicked (BorderButton *) ), - this, SLOT( changeState( BorderButton *) ) ); + connect( borderButtons[i], TQT_SIGNAL( clicked (BorderButton *) ), + this, TQT_SLOT( changeState( BorderButton *) ) ); } for (int i = BorderShortcutType_Remove; i < BorderShortcutType_END; i++) { - connect( shortcutButtons[i], SIGNAL( clicked(BorderButton *) ), - this, SLOT( preselect(BorderButton *) ) ); + connect( shortcutButtons[i], TQT_SIGNAL( clicked(BorderButton *) ), + this, TQT_SLOT( preselect(BorderButton *) ) ); } - connect( area ,SIGNAL( redraw()),this,SLOT(draw())); - connect( area ,SIGNAL( choosearea(QMouseEvent * )), - this,SLOT( slotPressEvent(QMouseEvent *))); + connect( area ,TQT_SIGNAL( redraw()),this,TQT_SLOT(draw())); + connect( area ,TQT_SIGNAL( choosearea(TQMouseEvent * )), + this,TQT_SLOT( slotPressEvent(TQMouseEvent *))); - connect( style, SIGNAL( activated(int)), this, SLOT(slotChangeStyle(int))); - connect( size, SIGNAL( textChanged(const QString &)), - this, SLOT(slotChangeStyle(const QString &))); - connect( size ,SIGNAL( activated(int)), this, SLOT(slotChangeStyle(int))); + connect( style, TQT_SIGNAL( activated(int)), this, TQT_SLOT(slotChangeStyle(int))); + connect( size, TQT_SIGNAL( textChanged(const TQString &)), + this, TQT_SLOT(slotChangeStyle(const TQString &))); + connect( size ,TQT_SIGNAL( activated(int)), this, TQT_SLOT(slotChangeStyle(int))); } void CellFormatPageBorder::cutomize_chosen_slot() @@ -2919,11 +2919,11 @@ void CellFormatPageBorder::cutomize_chosen_slot() style->setEnabled( false ); size->setEnabled( false ); pattern[2]->slotSelect(); - preview->setPattern( black , 1, SolidLine ); + preview->setPattern( black , 1, Qt::SolidLine ); } } -void CellFormatPageBorder::slotChangeStyle(const QString &) +void CellFormatPageBorder::slotChangeStyle(const TQString &) { /* if they try putting text in the size box, then erase the line */ slotChangeStyle(0); @@ -2932,30 +2932,30 @@ void CellFormatPageBorder::slotChangeStyle(const QString &) void CellFormatPageBorder::slotChangeStyle(int) { int index = style->currentItem(); - QString tmp; + TQString tmp; int penSize = size->currentText().toInt(); if ( !penSize) { - preview->setPattern( preview->getColor(), penSize, NoPen ); + preview->setPattern( preview->getColor(), penSize, Qt::NoPen ); } else { switch(index) { case 0: - preview->setPattern( preview->getColor(), penSize, DotLine ); + preview->setPattern( preview->getColor(), penSize, Qt::DotLine ); break; case 1: - preview->setPattern( preview->getColor(), penSize, DashLine ); + preview->setPattern( preview->getColor(), penSize, Qt::DashLine ); break; case 2: - preview->setPattern( preview->getColor(), penSize, DashDotLine ); + preview->setPattern( preview->getColor(), penSize, Qt::DashDotLine ); break; case 3: - preview->setPattern( preview->getColor(), penSize, DashDotDotLine ); + preview->setPattern( preview->getColor(), penSize, Qt::DashDotDotLine ); break; case 4: - preview->setPattern( preview->getColor(), penSize, SolidLine ); + preview->setPattern( preview->getColor(), penSize, Qt::SolidLine ); break; default: kdDebug(36001)<<"Error in combobox\n"; @@ -2965,23 +2965,23 @@ void CellFormatPageBorder::slotChangeStyle(int) slotUnselect2(preview); } -QPixmap CellFormatPageBorder::paintFormatPixmap(PenStyle _style) +TQPixmap CellFormatPageBorder::paintFormatPixmap(PenStyle _style) { - QPixmap pixmap( style->width(), 14 ); - QPainter painter; - QPen pen; - pen=QPen( colorGroup().text(),1,_style); + TQPixmap pixmap( style->width(), 14 ); + TQPainter painter; + TQPen pen; + pen=TQPen( tqcolorGroup().text(),1,_style); painter.begin( &pixmap ); - painter.fillRect( 0, 0, style->width(), 14, colorGroup().background() ); + painter.fillRect( 0, 0, style->width(), 14, tqcolorGroup().background() ); painter.setPen( pen ); painter.drawLine( 0, 7, style->width(), 7 ); painter.end(); return pixmap; } -void CellFormatPageBorder::loadIcon( QString _pix, BorderButton *_button) +void CellFormatPageBorder::loadIcon( TQString _pix, BorderButton *_button) { - _button->setPixmap( QPixmap( BarIcon(_pix, Factory::global()) ) ); + _button->setPixmap( TQPixmap( BarIcon(_pix, Factory::global()) ) ); } void CellFormatPageBorder::apply(FormatManipulator* obj) @@ -3013,7 +3013,7 @@ void CellFormatPageBorder::applyTopOutline(FormatManipulator* obj) { BorderButton * top = borderButtons[BorderType_Top]; - QPen tmpPen( top->getColor(), top->getPenWidth(), top->getPenStyle()); + TQPen tmpPen( top->getColor(), top->getPenWidth(), top->getPenStyle()); if ( dlg->getStyle() ) { @@ -3030,7 +3030,7 @@ void CellFormatPageBorder::applyBottomOutline(FormatManipulator* obj) { BorderButton * bottom = borderButtons[BorderType_Bottom]; - QPen tmpPen( bottom->getColor(), bottom->getPenWidth(), bottom->getPenStyle() ); + TQPen tmpPen( bottom->getColor(), bottom->getPenWidth(), bottom->getPenStyle() ); if ( dlg->getStyle() ) { @@ -3046,7 +3046,7 @@ void CellFormatPageBorder::applyBottomOutline(FormatManipulator* obj) void CellFormatPageBorder::applyLeftOutline(FormatManipulator* obj) { BorderButton * left = borderButtons[BorderType_Left]; - QPen tmpPen( left->getColor(), left->getPenWidth(), left->getPenStyle() ); + TQPen tmpPen( left->getColor(), left->getPenWidth(), left->getPenStyle() ); if ( dlg->getStyle() ) { @@ -3062,7 +3062,7 @@ void CellFormatPageBorder::applyLeftOutline(FormatManipulator* obj) void CellFormatPageBorder::applyRightOutline(FormatManipulator* obj) { BorderButton* right = borderButtons[BorderType_Right]; - QPen tmpPen( right->getColor(), right->getPenWidth(), right->getPenStyle() ); + TQPen tmpPen( right->getColor(), right->getPenWidth(), right->getPenStyle() ); if ( dlg->getStyle() ) { @@ -3079,9 +3079,9 @@ void CellFormatPageBorder::applyDiagonalOutline(FormatManipulator* obj) { BorderButton * fallDiagonal = borderButtons[BorderType_FallingDiagonal]; BorderButton * goUpDiagonal = borderButtons[BorderType_RisingDiagonal]; - QPen tmpPenFall( fallDiagonal->getColor(), fallDiagonal->getPenWidth(), + TQPen tmpPenFall( fallDiagonal->getColor(), fallDiagonal->getPenWidth(), fallDiagonal->getPenStyle()); - QPen tmpPenGoUp( goUpDiagonal->getColor(), goUpDiagonal->getPenWidth(), + TQPen tmpPenGoUp( goUpDiagonal->getColor(), goUpDiagonal->getPenWidth(), goUpDiagonal->getPenStyle()); if ( dlg->getStyle() ) @@ -3102,7 +3102,7 @@ void CellFormatPageBorder::applyDiagonalOutline(FormatManipulator* obj) void CellFormatPageBorder::applyHorizontalOutline(FormatManipulator* obj) { - QPen tmpPen( borderButtons[BorderType_Horizontal]->getColor(), + TQPen tmpPen( borderButtons[BorderType_Horizontal]->getColor(), borderButtons[BorderType_Horizontal]->getPenWidth(), borderButtons[BorderType_Horizontal]->getPenStyle()); @@ -3120,7 +3120,7 @@ void CellFormatPageBorder::applyHorizontalOutline(FormatManipulator* obj) void CellFormatPageBorder::applyVerticalOutline(FormatManipulator* obj) { BorderButton* vertical = borderButtons[BorderType_Vertical]; - QPen tmpPen( vertical->getColor(), vertical->getPenWidth(), + TQPen tmpPen( vertical->getColor(), vertical->getPenWidth(), vertical->getPenStyle()); if ( dlg->getStyle() ) @@ -3135,7 +3135,7 @@ void CellFormatPageBorder::applyVerticalOutline(FormatManipulator* obj) } -void CellFormatPageBorder::slotSetColorButton( const QColor &_color ) +void CellFormatPageBorder::slotSetColorButton( const TQColor &_color ) { currentColor = _color; @@ -3223,7 +3223,7 @@ void CellFormatPageBorder::preselect( BorderButton *_p ) vertical->setChanged(true); } } - area->repaint(); + area->tqrepaint(); } void CellFormatPageBorder::changeState( BorderButton *_p) @@ -3240,10 +3240,10 @@ void CellFormatPageBorder::changeState( BorderButton *_p) { _p->setPenWidth(1); _p->setPenStyle(Qt::NoPen); - _p->setColor( colorGroup().text() ); + _p->setColor( tqcolorGroup().text() ); } - area->repaint(); + area->tqrepaint(); } void CellFormatPageBorder::draw() @@ -3256,39 +3256,39 @@ void CellFormatPageBorder::draw() BorderButton* fallingDiagonal = borderButtons[BorderType_FallingDiagonal]; BorderButton* vertical = borderButtons[BorderType_Vertical]; BorderButton* horizontal = borderButtons[BorderType_Horizontal]; - QPen pen; - QPainter painter; + TQPen pen; + TQPainter painter; painter.begin( area ); - if ((bottom->getPenStyle())!=Qt::NoPen) + if ((bottom->getPenStyle())!=TQt::NoPen) { - pen=QPen( bottom->getColor(), bottom->getPenWidth(),bottom->getPenStyle()); + pen=TQPen( bottom->getColor(), bottom->getPenWidth(),bottom->getPenStyle()); painter.setPen( pen ); painter.drawLine( OFFSETX, area->height()-OFFSETY, area->width()-OFFSETX , area->height()-OFFSETY ); } - if ((top->getPenStyle())!=Qt::NoPen) + if ((top->getPenStyle())!=TQt::NoPen) { - pen=QPen( top->getColor(), top->getPenWidth(),top->getPenStyle()); + pen=TQPen( top->getColor(), top->getPenWidth(),top->getPenStyle()); painter.setPen( pen ); painter.drawLine( OFFSETX, OFFSETY, area->width() -OFFSETX, OFFSETY ); } - if ((left->getPenStyle())!=Qt::NoPen) + if ((left->getPenStyle())!=TQt::NoPen) { - pen=QPen( left->getColor(), left->getPenWidth(),left->getPenStyle()); + pen=TQPen( left->getColor(), left->getPenWidth(),left->getPenStyle()); painter.setPen( pen ); painter.drawLine( OFFSETX, OFFSETY, OFFSETX , area->height()-OFFSETY ); } - if ((right->getPenStyle())!=Qt::NoPen) + if ((right->getPenStyle())!=TQt::NoPen) { - pen=QPen( right->getColor(), right->getPenWidth(),right->getPenStyle()); + pen=TQPen( right->getColor(), right->getPenWidth(),right->getPenStyle()); painter.setPen( pen ); painter.drawLine( area->width()-OFFSETX, OFFSETY, area->width()-OFFSETX, area->height()-OFFSETY ); } - if ((fallingDiagonal->getPenStyle())!=Qt::NoPen) + if ((fallingDiagonal->getPenStyle())!=TQt::NoPen) { - pen=QPen( fallingDiagonal->getColor(), fallingDiagonal->getPenWidth(), + pen=TQPen( fallingDiagonal->getColor(), fallingDiagonal->getPenWidth(), fallingDiagonal->getPenStyle()); painter.setPen( pen ); painter.drawLine( OFFSETX, OFFSETY, area->width()-OFFSETX, @@ -3301,9 +3301,9 @@ void CellFormatPageBorder::draw() area->height()-OFFSETY ); } } - if ((risingDiagonal->getPenStyle())!=Qt::NoPen) + if ((risingDiagonal->getPenStyle())!=TQt::NoPen) { - pen=QPen( risingDiagonal->getColor(), risingDiagonal->getPenWidth(), + pen=TQPen( risingDiagonal->getColor(), risingDiagonal->getPenWidth(), risingDiagonal->getPenStyle()); painter.setPen( pen ); painter.drawLine( OFFSETX, area->height()-OFFSETY , area->width()-OFFSETX , @@ -3316,16 +3316,16 @@ void CellFormatPageBorder::draw() } } - if ((vertical->getPenStyle())!=Qt::NoPen) + if ((vertical->getPenStyle())!=TQt::NoPen) { - pen=QPen( vertical->getColor(), vertical->getPenWidth(), + pen=TQPen( vertical->getColor(), vertical->getPenWidth(), vertical->getPenStyle()); painter.setPen( pen ); painter.drawLine( area->width()/2, 5 , area->width()/2 , area->height()-5 ); } - if ((horizontal->getPenStyle())!=Qt::NoPen) + if ((horizontal->getPenStyle())!=TQt::NoPen) { - pen=QPen( horizontal->getColor(), horizontal->getPenWidth(), + pen=TQPen( horizontal->getColor(), horizontal->getPenWidth(), horizontal->getPenStyle()); painter.setPen( pen ); painter.drawLine( OFFSETX,area->height()/2,area->width()-OFFSETX, @@ -3350,7 +3350,7 @@ void CellFormatPageBorder::invertState(BorderButton *_p) } } -void CellFormatPageBorder::slotPressEvent(QMouseEvent *_ev) +void CellFormatPageBorder::slotPressEvent(TQMouseEvent *_ev) { BorderButton* top = borderButtons[BorderType_Top]; BorderButton* bottom = borderButtons[BorderType_Bottom]; @@ -3360,8 +3360,8 @@ void CellFormatPageBorder::slotPressEvent(QMouseEvent *_ev) BorderButton* horizontal = borderButtons[BorderType_Horizontal]; - QRect rect(OFFSETX,OFFSETY-8,area->width()-OFFSETX,OFFSETY+8); - if (rect.contains(QPoint(_ev->x(),_ev->y()))) + TQRect rect(OFFSETX,OFFSETY-8,area->width()-OFFSETX,OFFSETY+8); + if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) { if (((top->getPenWidth()!=preview->getPenWidth()) || (top->getColor()!=currentColor) || @@ -3378,7 +3378,7 @@ void CellFormatPageBorder::slotPressEvent(QMouseEvent *_ev) } rect.setCoords(OFFSETX,area->height()-OFFSETY-8,area->width()-OFFSETX, area->height()-OFFSETY+8); - if (rect.contains(QPoint(_ev->x(),_ev->y()))) + if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) { if (((bottom->getPenWidth()!=preview->getPenWidth()) || (bottom->getColor()!=currentColor) || @@ -3395,7 +3395,7 @@ void CellFormatPageBorder::slotPressEvent(QMouseEvent *_ev) } rect.setCoords(OFFSETX-8,OFFSETY,OFFSETX+8,area->height()-OFFSETY); - if (rect.contains(QPoint(_ev->x(),_ev->y()))) + if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) { if (((left->getPenWidth()!=preview->getPenWidth()) || (left->getColor()!=currentColor) || @@ -3412,7 +3412,7 @@ void CellFormatPageBorder::slotPressEvent(QMouseEvent *_ev) } rect.setCoords(area->width()-OFFSETX-8,OFFSETY,area->width()-OFFSETX+8, area->height()-OFFSETY); - if (rect.contains(QPoint(_ev->x(),_ev->y()))) + if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) { if (((right->getPenWidth()!=preview->getPenWidth()) || (right->getColor()!=currentColor) || @@ -3431,12 +3431,12 @@ void CellFormatPageBorder::slotPressEvent(QMouseEvent *_ev) //don't work because I don't know how create a rectangle //for diagonal /*rect.setCoords(OFFSETX,OFFSETY,XLEN-OFFSETX,YHEI-OFFSETY); -if (rect.contains(QPoint(_ev->x(),_ev->y()))) +if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) { invertState(fallDiagonal); } rect.setCoords(OFFSETX,YHEI-OFFSETY,XLEN-OFFSETX,OFFSETY); -if (rect.contains(QPoint(_ev->x(),_ev->y()))) +if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) { invertState(goUpDiagonal); } */ @@ -3446,7 +3446,7 @@ if (rect.contains(QPoint(_ev->x(),_ev->y()))) rect.setCoords(area->width()/2-8,OFFSETY,area->width()/2+8, area->height()-OFFSETY); - if (rect.contains(QPoint(_ev->x(),_ev->y()))) + if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) { if (((vertical->getPenWidth()!=preview->getPenWidth()) || (vertical->getColor()!=currentColor) || @@ -3466,7 +3466,7 @@ if (rect.contains(QPoint(_ev->x(),_ev->y()))) { rect.setCoords(OFFSETX,area->height()/2-8,area->width()-OFFSETX, area->height()/2+8); - if (rect.contains(QPoint(_ev->x(),_ev->y()))) + if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) { if (((horizontal->getPenWidth()!=preview->getPenWidth()) || (horizontal->getColor()!=currentColor) || @@ -3483,7 +3483,7 @@ if (rect.contains(QPoint(_ev->x(),_ev->y()))) } } - area->repaint(); + area->tqrepaint(); } @@ -3494,35 +3494,35 @@ if (rect.contains(QPoint(_ev->x(),_ev->y()))) * ***************************************************************************/ -BrushSelect::BrushSelect( QWidget *parent, const char * ) : QFrame( parent ) +BrushSelect::BrushSelect( TQWidget *tqparent, const char * ) : TQFrame( tqparent ) { brushStyle = Qt::NoBrush; - brushColor = Qt::red; + brushColor = TQt::red; selected = false; } -void BrushSelect::setPattern( const QColor &_color,BrushStyle _style ) +void BrushSelect::setPattern( const TQColor &_color,Qt::BrushStyle _style ) { brushStyle = _style; brushColor = _color; - repaint(); + tqrepaint(); } -void BrushSelect::paintEvent( QPaintEvent *_ev ) +void BrushSelect::paintEvent( TQPaintEvent *_ev ) { - QFrame::paintEvent( _ev ); + TQFrame::paintEvent( _ev ); - QPainter painter; - QBrush brush(brushColor,brushStyle); + TQPainter painter; + TQBrush brush(brushColor,brushStyle); painter.begin( this ); - painter.setPen( Qt::NoPen ); + painter.setPen( TQt::NoPen ); painter.setBrush( brush); painter.drawRect( 2, 2, width()-4, height()-4); painter.end(); } -void BrushSelect::mousePressEvent( QMouseEvent * ) +void BrushSelect::mousePressEvent( TQMouseEvent * ) { slotSelect(); @@ -3534,8 +3534,8 @@ void BrushSelect::slotUnselect() selected = false; setLineWidth( 1 ); - setFrameStyle( QFrame::Panel | QFrame::Sunken ); - repaint(); + setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); + tqrepaint(); } void BrushSelect::slotSelect() @@ -3543,8 +3543,8 @@ void BrushSelect::slotSelect() selected = true; setLineWidth( 2 ); - setFrameStyle( QFrame::Panel | QFrame::Plain ); - repaint(); + setFrameStyle( TQFrame::Panel | TQFrame::Plain ); + tqrepaint(); } @@ -3555,186 +3555,186 @@ void BrushSelect::slotSelect() * ***************************************************************************/ -CellFormatPagePattern::CellFormatPagePattern( QWidget* parent, CellFormatDialog *_dlg ) : QWidget( parent ) +CellFormatPagePattern::CellFormatPagePattern( TQWidget* tqparent, CellFormatDialog *_dlg ) : TQWidget( tqparent ) { dlg = _dlg; bBgColorUndefined = !dlg->bBgColor; - QGridLayout *grid = new QGridLayout(this,5,2,KDialog::marginHint(), KDialog::spacingHint()); + TQGridLayout *grid = new TQGridLayout(this,5,2,KDialog::marginHint(), KDialog::spacingHint()); - QGroupBox* tmpQGroupBox; - tmpQGroupBox = new QGroupBox( this, "GroupBox_20" ); - tmpQGroupBox->setFrameStyle( QFrame::Box | QFrame::Sunken ); - tmpQGroupBox->setTitle( i18n("Pattern") ); - tmpQGroupBox->setAlignment( AlignLeft ); + TQGroupBox* tmpTQGroupBox; + tmpTQGroupBox = new TQGroupBox( this, "GroupBox_20" ); + tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); + tmpTQGroupBox->setTitle( i18n("Pattern") ); + tmpTQGroupBox->tqsetAlignment( AlignLeft ); - QGridLayout *grid2 = new QGridLayout(tmpQGroupBox,8,3,KDialog::marginHint(), KDialog::spacingHint()); - int fHeight = tmpQGroupBox->fontMetrics().height(); + TQGridLayout *grid2 = new TQGridLayout(tmpTQGroupBox,8,3,KDialog::marginHint(), KDialog::spacingHint()); + int fHeight = tmpTQGroupBox->fontMetrics().height(); grid2->addRowSpacing( 0, fHeight/2 ); // groupbox title - brush1 = new BrushSelect( tmpQGroupBox, "Frame_1" ); - brush1->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + brush1 = new BrushSelect( tmpTQGroupBox, "Frame_1" ); + brush1->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(brush1,1,0); - brush2 = new BrushSelect( tmpQGroupBox, "Frame_2" ); - brush2->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + brush2 = new BrushSelect( tmpTQGroupBox, "Frame_2" ); + brush2->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(brush2,1,1); - brush3 = new BrushSelect( tmpQGroupBox, "Frame_3" ); - brush3->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + brush3 = new BrushSelect( tmpTQGroupBox, "Frame_3" ); + brush3->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(brush3,1,2); - brush4 = new BrushSelect( tmpQGroupBox, "Frame_4" ); - brush4->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + brush4 = new BrushSelect( tmpTQGroupBox, "Frame_4" ); + brush4->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(brush4,2,0); - brush5 = new BrushSelect( tmpQGroupBox, "Frame_5" ); - brush5->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + brush5 = new BrushSelect( tmpTQGroupBox, "Frame_5" ); + brush5->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(brush5,2,1); - brush6 = new BrushSelect( tmpQGroupBox, "Frame_6" ); - brush6->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + brush6 = new BrushSelect( tmpTQGroupBox, "Frame_6" ); + brush6->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(brush6,2,2); - brush7 = new BrushSelect( tmpQGroupBox, "Frame_7" ); - brush7->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + brush7 = new BrushSelect( tmpTQGroupBox, "Frame_7" ); + brush7->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(brush7,3,0); - brush8 = new BrushSelect( tmpQGroupBox, "Frame_8" ); - brush8->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + brush8 = new BrushSelect( tmpTQGroupBox, "Frame_8" ); + brush8->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(brush8,3,1); - brush9 = new BrushSelect( tmpQGroupBox, "Frame_9" ); - brush9->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + brush9 = new BrushSelect( tmpTQGroupBox, "Frame_9" ); + brush9->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(brush9,3,2); - brush10 = new BrushSelect( tmpQGroupBox, "Frame_10" ); - brush10->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + brush10 = new BrushSelect( tmpTQGroupBox, "Frame_10" ); + brush10->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(brush10,4,0); - brush11 = new BrushSelect( tmpQGroupBox, "Frame_11" ); - brush11->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + brush11 = new BrushSelect( tmpTQGroupBox, "Frame_11" ); + brush11->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(brush11,4,1); - brush12 = new BrushSelect( tmpQGroupBox, "Frame_12" ); - brush12->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + brush12 = new BrushSelect( tmpTQGroupBox, "Frame_12" ); + brush12->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(brush12,4,2); - brush13 = new BrushSelect( tmpQGroupBox, "Frame_13" ); - brush13->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + brush13 = new BrushSelect( tmpTQGroupBox, "Frame_13" ); + brush13->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(brush13,5,0); - brush14 = new BrushSelect( tmpQGroupBox, "Frame_14" ); - brush14->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + brush14 = new BrushSelect( tmpTQGroupBox, "Frame_14" ); + brush14->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(brush14,5,1); - brush15 = new BrushSelect( tmpQGroupBox, "Frame_15" ); - brush15->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + brush15 = new BrushSelect( tmpTQGroupBox, "Frame_15" ); + brush15->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(brush15,5,2); - QGridLayout *grid3 = new QGridLayout( 1, 2 ); - color = new KColorButton (tmpQGroupBox, "ColorButton_1" ); + TQGridLayout *grid3 = new TQGridLayout( 1, 2 ); + color = new KColorButton (tmpTQGroupBox, "ColorButton_1" ); grid3->addWidget(color,0,1); - QLabel *tmpQLabel = new QLabel( tmpQGroupBox, "Label_1" ); - tmpQLabel->setText( i18n("Color:") ); - grid3->addWidget(tmpQLabel,0,0); + TQLabel *tmpTQLabel = new TQLabel( tmpTQGroupBox, "Label_1" ); + tmpTQLabel->setText( i18n("Color:") ); + grid3->addWidget(tmpTQLabel,0,0); grid2->addMultiCell(grid3,6,6,0,2); - grid3 = new QGridLayout( 1, 3 ); + grid3 = new TQGridLayout( 1, 3 ); grid3->setSpacing(KDialog::spacingHint()); - tmpQLabel = new QLabel( tmpQGroupBox, "Label_2" ); - grid3->addWidget(tmpQLabel,0,0); - tmpQLabel->setText( i18n("Background color:") ); + tmpTQLabel = new TQLabel( tmpTQGroupBox, "Label_2" ); + grid3->addWidget(tmpTQLabel,0,0); + tmpTQLabel->setText( i18n("Background color:") ); - bgColorButton = new KColorButton( tmpQGroupBox, "ColorButton" ); + bgColorButton = new KColorButton( tmpTQGroupBox, "ColorButton" ); grid3->addWidget(bgColorButton,0,1); if ( dlg->bBgColor ) bgColor = dlg->bgColor; else - bgColor = colorGroup().base(); + bgColor = tqcolorGroup().base(); if (!bgColor.isValid()) - bgColor = colorGroup().base(); + bgColor = tqcolorGroup().base(); bgColorButton->setColor( bgColor ); - connect( bgColorButton, SIGNAL( changed( const QColor & ) ), - this, SLOT( slotSetBackgroundColor( const QColor & ) ) ); + connect( bgColorButton, TQT_SIGNAL( changed( const TQColor & ) ), + this, TQT_SLOT( slotSetBackgroundColor( const TQColor & ) ) ); - notAnyColor=new QPushButton(i18n("No Color"),tmpQGroupBox); + notAnyColor=new TQPushButton(i18n("No Color"),tmpTQGroupBox); grid3->addWidget(notAnyColor,0,2); - connect( notAnyColor, SIGNAL( clicked( ) ), - this, SLOT( slotNotAnyColor( ) ) ); + connect( notAnyColor, TQT_SIGNAL( clicked( ) ), + this, TQT_SLOT( slotNotAnyColor( ) ) ); b_notAnyColor=false; grid2->addMultiCell(grid3,7,7,0,2); - grid->addMultiCellWidget(tmpQGroupBox,0,3,0,0); + grid->addMultiCellWidget(tmpTQGroupBox,0,3,0,0); - tmpQGroupBox = new QGroupBox( this, "GroupBox1" ); - tmpQGroupBox->setTitle( i18n("Preview") ); - tmpQGroupBox->setFrameStyle( QFrame::Box | QFrame::Sunken ); - tmpQGroupBox->setAlignment( AlignLeft ); + tmpTQGroupBox = new TQGroupBox( this, "GroupBox1" ); + tmpTQGroupBox->setTitle( i18n("Preview") ); + tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); + tmpTQGroupBox->tqsetAlignment( AlignLeft ); - grid2 = new QGridLayout(tmpQGroupBox,2,1,KDialog::marginHint(), KDialog::spacingHint()); - fHeight = tmpQGroupBox->fontMetrics().height(); + grid2 = new TQGridLayout(tmpTQGroupBox,2,1,KDialog::marginHint(), KDialog::spacingHint()); + fHeight = tmpTQGroupBox->fontMetrics().height(); grid2->addRowSpacing( 0, fHeight/2 ); // groupbox title - current = new BrushSelect( tmpQGroupBox, "Current" ); - current->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + current = new BrushSelect( tmpTQGroupBox, "Current" ); + current->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); grid2->addWidget(current,1,0); - grid->addWidget( tmpQGroupBox,4,0); - - connect( brush1, SIGNAL( clicked( BrushSelect* ) ), - this, SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush2, SIGNAL( clicked( BrushSelect* ) ), - this, SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush3, SIGNAL( clicked( BrushSelect* ) ), - this, SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush4, SIGNAL( clicked( BrushSelect* ) ), - this, SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush5, SIGNAL( clicked( BrushSelect* ) ), - this, SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush6, SIGNAL( clicked( BrushSelect* ) ), - this, SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush7, SIGNAL( clicked( BrushSelect* ) ), - this, SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush8, SIGNAL( clicked( BrushSelect* ) ), - this, SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush9, SIGNAL( clicked( BrushSelect* ) ), - this, SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush10, SIGNAL( clicked( BrushSelect* ) ), - this, SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush11, SIGNAL( clicked( BrushSelect* ) ), - this, SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush12, SIGNAL( clicked( BrushSelect* ) ), - this, SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush13, SIGNAL( clicked( BrushSelect* ) ), - this, SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush14, SIGNAL( clicked( BrushSelect* ) ), - this, SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush15, SIGNAL( clicked( BrushSelect* ) ), - this, SLOT( slotUnselect2( BrushSelect* ) ) ); - - brush1->setPattern( Qt::red, Qt::VerPattern ); - brush2->setPattern( Qt::red,Qt::HorPattern ); - brush3->setPattern( Qt::red,Qt::Dense1Pattern ); - brush4->setPattern( Qt::red,Qt::Dense2Pattern ); - brush5->setPattern( Qt::red,Qt::Dense3Pattern ); - brush6->setPattern( Qt::red,Qt::Dense4Pattern ); - brush7->setPattern( Qt::red,Qt::Dense5Pattern ); - brush8->setPattern( Qt::red,Qt::Dense6Pattern ); - brush9->setPattern( Qt::red,Qt::Dense7Pattern ); - brush10->setPattern( Qt::red,Qt::CrossPattern ); - brush11->setPattern( Qt::red,Qt::BDiagPattern ); - brush12->setPattern( Qt::red,Qt::FDiagPattern ); - brush13->setPattern( Qt::red,Qt::VerPattern ); - brush14->setPattern( Qt::red,Qt::DiagCrossPattern ); - brush15->setPattern( Qt::red,Qt::NoBrush ); + grid->addWidget( tmpTQGroupBox,4,0); + + connect( brush1, TQT_SIGNAL( clicked( BrushSelect* ) ), + this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush2, TQT_SIGNAL( clicked( BrushSelect* ) ), + this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush3, TQT_SIGNAL( clicked( BrushSelect* ) ), + this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush4, TQT_SIGNAL( clicked( BrushSelect* ) ), + this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush5, TQT_SIGNAL( clicked( BrushSelect* ) ), + this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush6, TQT_SIGNAL( clicked( BrushSelect* ) ), + this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush7, TQT_SIGNAL( clicked( BrushSelect* ) ), + this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush8, TQT_SIGNAL( clicked( BrushSelect* ) ), + this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush9, TQT_SIGNAL( clicked( BrushSelect* ) ), + this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush10, TQT_SIGNAL( clicked( BrushSelect* ) ), + this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush11, TQT_SIGNAL( clicked( BrushSelect* ) ), + this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush12, TQT_SIGNAL( clicked( BrushSelect* ) ), + this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush13, TQT_SIGNAL( clicked( BrushSelect* ) ), + this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush14, TQT_SIGNAL( clicked( BrushSelect* ) ), + this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush15, TQT_SIGNAL( clicked( BrushSelect* ) ), + this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); + + brush1->setPattern( TQt::red,Qt::VerPattern ); + brush2->setPattern( TQt::red,Qt::HorPattern ); + brush3->setPattern( TQt::red,Qt::Dense1Pattern ); + brush4->setPattern( TQt::red,Qt::Dense2Pattern ); + brush5->setPattern( TQt::red,Qt::Dense3Pattern ); + brush6->setPattern( TQt::red,Qt::Dense4Pattern ); + brush7->setPattern( TQt::red,Qt::Dense5Pattern ); + brush8->setPattern( TQt::red,Qt::Dense6Pattern ); + brush9->setPattern( TQt::red,Qt::Dense7Pattern ); + brush10->setPattern( TQt::red,Qt::CrossPattern ); + brush11->setPattern( TQt::red,Qt::BDiagPattern ); + brush12->setPattern( TQt::red,Qt::FDiagPattern ); + brush13->setPattern( TQt::red,Qt::VerPattern ); + brush14->setPattern( TQt::red,Qt::DiagCrossPattern ); + brush15->setPattern( TQt::red,Qt::NoBrush ); current->setPattern(dlg->brushColor,dlg->brushStyle); current->slotSelect(); @@ -3742,8 +3742,8 @@ CellFormatPagePattern::CellFormatPagePattern( QWidget* parent, CellFormatDialog color->setColor(dlg->brushColor); current->setBackgroundColor( bgColor ); - connect( color, SIGNAL( changed( const QColor & ) ), - this, SLOT( slotSetColorButton( const QColor & ) ) ); + connect( color, TQT_SIGNAL( changed( const TQColor & ) ), + this, TQT_SLOT( slotSetColorButton( const TQColor & ) ) ); slotSetColorButton( dlg->brushColor ); init(); @@ -3753,11 +3753,11 @@ CellFormatPagePattern::CellFormatPagePattern( QWidget* parent, CellFormatDialog void CellFormatPagePattern::slotNotAnyColor() { b_notAnyColor = true; - bgColorButton->setColor( colorGroup().base() ); - current->setBackgroundColor( colorGroup().base() ); + bgColorButton->setColor( tqcolorGroup().base() ); + current->setBackgroundColor( tqcolorGroup().base() ); } -void CellFormatPagePattern::slotSetBackgroundColor( const QColor &_color ) +void CellFormatPagePattern::slotSetBackgroundColor( const TQColor &_color ) { bgColor =_color; current->setBackgroundColor( bgColor ); @@ -3767,63 +3767,63 @@ void CellFormatPagePattern::slotSetBackgroundColor( const QColor &_color ) void CellFormatPagePattern::init() { - if (dlg->brushStyle == Qt::VerPattern) + if (dlg->brushStyle == TQt::VerPattern) { brush1->slotSelect(); } - else if (dlg->brushStyle == Qt::HorPattern) + else if (dlg->brushStyle == TQt::HorPattern) { brush2->slotSelect(); } - else if (dlg->brushStyle == Qt::Dense1Pattern) + else if (dlg->brushStyle == TQt::Dense1Pattern) { brush3->slotSelect(); } - else if (dlg->brushStyle == Qt::Dense2Pattern) + else if (dlg->brushStyle == TQt::Dense2Pattern) { brush4->slotSelect(); } - else if (dlg->brushStyle == Qt::Dense3Pattern) + else if (dlg->brushStyle == TQt::Dense3Pattern) { brush5->slotSelect(); } - else if (dlg->brushStyle == Qt::Dense4Pattern) + else if (dlg->brushStyle == TQt::Dense4Pattern) { brush6->slotSelect(); } - else if (dlg->brushStyle == Qt::Dense5Pattern) + else if (dlg->brushStyle == TQt::Dense5Pattern) { brush7->slotSelect(); } - else if (dlg->brushStyle == Qt::Dense6Pattern) + else if (dlg->brushStyle == TQt::Dense6Pattern) { brush8->slotSelect(); } - else if (dlg->brushStyle == Qt::Dense7Pattern) + else if (dlg->brushStyle == TQt::Dense7Pattern) { brush9->slotSelect(); } - else if (dlg->brushStyle == Qt::CrossPattern) + else if (dlg->brushStyle == TQt::CrossPattern) { brush10->slotSelect(); } - else if (dlg->brushStyle == Qt::BDiagPattern) + else if (dlg->brushStyle == TQt::BDiagPattern) { brush11->slotSelect(); } - else if (dlg->brushStyle == Qt::FDiagPattern) + else if (dlg->brushStyle == TQt::FDiagPattern) { brush12->slotSelect(); } - else if (dlg->brushStyle == Qt::VerPattern) + else if (dlg->brushStyle == TQt::VerPattern) { brush13->slotSelect(); } - else if (dlg->brushStyle == Qt::DiagCrossPattern) + else if (dlg->brushStyle == TQt::DiagCrossPattern) { brush14->slotSelect(); } - else if (dlg->brushStyle == Qt::NoBrush) + else if (dlg->brushStyle == TQt::NoBrush) { brush15->slotSelect(); } @@ -3831,7 +3831,7 @@ void CellFormatPagePattern::init() kdDebug(36001) << "Error in brushStyle" << endl; } -void CellFormatPagePattern::slotSetColorButton( const QColor &_color ) +void CellFormatPagePattern::slotSetColorButton( const TQColor &_color ) { currentColor = _color; @@ -3896,12 +3896,12 @@ void CellFormatPagePattern::apply( CustomStyle * style ) if ( selectedBrush != 0L && ( dlg->brushStyle != selectedBrush->getBrushStyle() || dlg->brushColor != selectedBrush->getBrushColor() ) ) - style->changeBackGroundBrush( QBrush( selectedBrush->getBrushColor(), selectedBrush->getBrushStyle() ) ); + style->changeBackGroundBrush( TQBrush( selectedBrush->getBrushColor(), selectedBrush->getBrushStyle() ) ); /* TODO: check... if ( b_notAnyColor) - style->changeBgColor( QColor() ); + style->changeBgColor( TQColor() ); else */ if ( bgColor != dlg->getStyle()->bgColor() ) @@ -3913,13 +3913,13 @@ void CellFormatPagePattern::apply(FormatManipulator *_obj) if ( selectedBrush != 0L && ( dlg->brushStyle != selectedBrush->getBrushStyle() || dlg->brushColor != selectedBrush->getBrushColor() ) ) - _obj->setBackgroundBrush( QBrush( selectedBrush->getBrushColor(), selectedBrush->getBrushStyle() ) ); + _obj->setBackgroundBrush( TQBrush( selectedBrush->getBrushColor(), selectedBrush->getBrushStyle() ) ); if ( bgColor == dlg->bgColor ) return; if ( b_notAnyColor) - _obj->setBackgroundColor( QColor() ); + _obj->setBackgroundColor( TQColor() ); else if ( !bBgColorUndefined ) _obj->setBackgroundColor( bgColor ); } diff --git a/kspread/dialogs/kspread_dlg_layout.h b/kspread/dialogs/kspread_dlg_layout.h index 0dfb10fa0..a16e409d4 100644 --- a/kspread/dialogs/kspread_dlg_layout.h +++ b/kspread/dialogs/kspread_dlg_layout.h @@ -31,10 +31,10 @@ #define __kspread_dlg_layout_h__ -#include <qtabdialog.h> -#include <qapplication.h> -#include <qbuttongroup.h> -#include <qgroupbox.h> +#include <tqtabdialog.h> +#include <tqapplication.h> +#include <tqbuttongroup.h> +#include <tqgroupbox.h> #include <knuminput.h> #include <kcompletion.h> #include "kspread_view.h" @@ -45,23 +45,23 @@ #include "font_cell_format.h" #include "protection_cell_format.h" -#include <qpushbutton.h> -#include <qcheckbox.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> class KoUnitDoubleSpinBox; -class QPixmap; -class QRadioButton; -class QPushButton; -class QDate; -class QTime; -class QLabel; -class QWidget; +class TQPixmap; +class TQRadioButton; +class TQPushButton; +class TQDate; +class TQTime; +class TQLabel; +class TQWidget; class KLineEdit; -class QFrame; -class QListBox; -class QCheckBox; +class TQFrame; +class TQListBox; +class TQCheckBox; class KColorButton; -class QComboBox; +class TQComboBox; class KComboBox; class KoUnitDoubleSpinBox; @@ -94,22 +94,23 @@ enum BorderShortcutType BorderShortcutType_END }; -class PatternSelect : public QFrame +class PatternSelect : public TQFrame { Q_OBJECT + TQ_OBJECT public: - PatternSelect( QWidget *parent, const char *_name ); + PatternSelect( TQWidget *tqparent, const char *_name ); - void setPenStyle( PenStyle _pat ) { penStyle = _pat; repaint(); } - PenStyle getPenStyle() { return penStyle; } - void setColor( const QColor &_col ) { penColor = _col; repaint(); } - const QColor& getColor() { return penColor; } - void setPenWidth( int _w ) { penWidth = _w; repaint(); } + void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat; tqrepaint(); } + Qt::PenStyle getPenStyle() { return penStyle; } + void setColor( const TQColor &_col ) { penColor = _col; tqrepaint(); } + const TQColor& getColor() { return penColor; } + void setPenWidth( int _w ) { penWidth = _w; tqrepaint(); } int getPenWidth() { return penWidth; } - void setPattern( const QColor &_color, int _width, PenStyle _style ); + void setPattern( const TQColor &_color, int _width, Qt::PenStyle _style ); void setUndefined(); - void setDefined() { undefined = FALSE; repaint(); } + void setDefined() { undefined = FALSE; tqrepaint(); } bool isDefined() { return !undefined; } @@ -121,29 +122,30 @@ public slots: void slotSelect(); protected: - virtual void paintEvent( QPaintEvent *_ev ); - virtual void mousePressEvent( QMouseEvent *_ev ); + virtual void paintEvent( TQPaintEvent *_ev ); + virtual void mousePressEvent( TQMouseEvent *_ev ); - PenStyle penStyle; - QColor penColor; + Qt::PenStyle penStyle; + TQColor penColor; int penWidth; bool selected; bool undefined; }; -class GeneralTab : public QWidget +class GeneralTab : public TQWidget { Q_OBJECT + TQ_OBJECT public: - GeneralTab( QWidget * parent, CellFormatDialog * _dlg ); + GeneralTab( TQWidget * tqparent, CellFormatDialog * _dlg ); ~GeneralTab(); bool apply( CustomStyle * style ); protected slots: - void slotNewParent( const QString & parentName ); + void slotNewParent( const TQString & tqparentName ); void slotNameChanged(); private: @@ -151,10 +153,10 @@ class GeneralTab : public QWidget KComboBox * m_parentBox; KLineEdit * m_nameEdit; - QString m_name; - QString m_parent; + TQString m_name; + TQString m_parent; - bool checkParent( const QString & parentName ); + bool checkParent( const TQString & tqparentName ); bool checkName(); }; @@ -163,8 +165,9 @@ class GeneralTab : public QWidget class CellFormatPageFont : public FontTab { Q_OBJECT + TQ_OBJECT public: - CellFormatPageFont( QWidget* parent, CellFormatDialog *_dlg ); + CellFormatPageFont( TQWidget* tqparent, CellFormatDialog *_dlg ); void apply( CustomStyle * style ); void apply( FormatManipulator *_obj ); @@ -174,24 +177,24 @@ signals: * Connect to this to monitor the font as it as selected if you are * not running modal. */ - void fontSelected( const QFont &font ); + void fontSelected( const TQFont &font ); private slots: - void family_chosen_slot(const QString & ); - void size_chosen_slot(const QString & ); - void weight_chosen_slot(const QString &); - void style_chosen_slot(const QString &); + void family_chosen_slot(const TQString & ); + void size_chosen_slot(const TQString & ); + void weight_chosen_slot(const TQString &); + void style_chosen_slot(const TQString &); void underline_chosen_slot(); void strike_chosen_slot(); - void display_example(const QFont &font); - void slotSetTextColor( const QColor &_color ); + void display_example(const TQFont &font); + void slotSetTextColor( const TQColor &_color ); private: void setCombos(); - QColor textColor; - QFont selFont; + TQColor textColor; + TQFont selFont; bool fontChanged; bool bTextColorUndefined; CellFormatDialog *dlg; @@ -202,11 +205,12 @@ private: * This widget is part of the format dialog. * It allows the user to cinfigure the way numbers are formatted. */ -class CellFormatPageFloat : public QWidget +class CellFormatPageFloat : public TQWidget { Q_OBJECT + TQ_OBJECT public: - CellFormatPageFloat( QWidget *parent, CellFormatDialog *_dlg ); + CellFormatPageFloat( TQWidget *tqparent, CellFormatDialog *_dlg ); void apply( CustomStyle * style ); void apply( FormatManipulator *_obj ); @@ -217,27 +221,27 @@ public slots: void init(); void slotChangeValue(int); void formatChanged(int); - void currencyChanged(const QString &); + void currencyChanged(const TQString &); protected: - QLineEdit* postfix; + TQLineEdit* postfix; KIntNumInput* precision; - QLineEdit* prefix; - QComboBox *format; - QComboBox *currency; - QLabel *currencyLabel; - QRadioButton *generic; - QRadioButton *number; - QRadioButton *percent; - QRadioButton *date; - QRadioButton *money; - QRadioButton *scientific; - QRadioButton *fraction; - QRadioButton *time; - QRadioButton *textFormat; - QRadioButton *customFormat; - QListBox *listFormat; - QLineEdit* customFormatEdit; - QLabel *exampleLabel; + TQLineEdit* prefix; + TQComboBox *format; + TQComboBox *currency; + TQLabel *currencyLabel; + TQRadioButton *generic; + TQRadioButton *number; + TQRadioButton *percent; + TQRadioButton *date; + TQRadioButton *money; + TQRadioButton *scientific; + TQRadioButton *fraction; + TQRadioButton *time; + TQRadioButton *textFormat; + TQRadioButton *customFormat; + TQListBox *listFormat; + TQLineEdit* customFormatEdit; + TQLabel *exampleLabel; CellFormatDialog *dlg; FormatType cellFormatType, newFormatType; //test if value changed @@ -248,8 +252,9 @@ protected: class CellFormatPagePosition : public PositionTab { Q_OBJECT + TQ_OBJECT public: - CellFormatPagePosition( QWidget *parent, CellFormatDialog *_dlg ); + CellFormatPagePosition( TQWidget *tqparent, CellFormatDialog *_dlg ); void apply( CustomStyle * style ); void apply( FormatManipulator *_obj ); @@ -276,30 +281,32 @@ protected: -class Border : public QFrame +class Border : public TQFrame { Q_OBJECT + TQ_OBJECT public: - Border( QWidget *parent,const char *_name,bool _oneCol,bool _oneRow ); + Border( TQWidget *tqparent,const char *_name,bool _oneCol,bool _oneRow ); signals: void redraw(); - void choosearea(QMouseEvent * _ev); + void choosearea(TQMouseEvent * _ev); protected: - virtual void paintEvent( QPaintEvent *_ev ); - virtual void mousePressEvent( QMouseEvent* _ev ); + virtual void paintEvent( TQPaintEvent *_ev ); + virtual void mousePressEvent( TQMouseEvent* _ev ); bool oneCol; bool oneRow; }; -class BorderButton : public QPushButton +class BorderButton : public TQPushButton { Q_OBJECT + TQ_OBJECT public: - BorderButton( QWidget *parent, const char *_name ); - void setPenStyle( PenStyle _pat ) { penStyle = _pat;} - PenStyle getPenStyle() { return penStyle; } - void setColor( const QColor &_col ) { penColor = _col; } - const QColor& getColor() { return penColor; } + BorderButton( TQWidget *tqparent, const char *_name ); + void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat;} + Qt::PenStyle getPenStyle() { return penStyle; } + void setColor( const TQColor &_col ) { penColor = _col; } + const TQColor& getColor() { return penColor; } void setPenWidth( int _w ) { penWidth = _w; } int getPenWidth() { return penWidth; } bool isChanged() { return changed; } @@ -309,34 +316,35 @@ public: signals: void clicked(BorderButton *); protected: - virtual void mousePressEvent( QMouseEvent *_ev ); - PenStyle penStyle; - QColor penColor; + virtual void mousePressEvent( TQMouseEvent *_ev ); + Qt::PenStyle penStyle; + TQColor penColor; int penWidth; bool changed; }; -class CellFormatPageBorder : public QWidget +class CellFormatPageBorder : public TQWidget { Q_OBJECT + TQ_OBJECT public: - CellFormatPageBorder( QWidget *parent, CellFormatDialog *_dlg ); + CellFormatPageBorder( TQWidget *tqparent, CellFormatDialog *_dlg ); void apply(FormatManipulator* obj); void invertState(BorderButton *_button); - QPixmap paintFormatPixmap(PenStyle _style); + TQPixmap paintFormatPixmap(PenStyle _style); public slots: void changeState(BorderButton *_this); void preselect( BorderButton *_this); void draw(); - void slotSetColorButton( const QColor &_color ); + void slotSetColorButton( const TQColor &_color ); void slotUnselect2( PatternSelect *_select ); - void loadIcon( QString pix,BorderButton *_button); - void slotPressEvent(QMouseEvent *_ev); + void loadIcon( TQString pix,BorderButton *_button); + void slotPressEvent(TQMouseEvent *_ev); void slotChangeStyle(int ); - void slotChangeStyle(const QString & ); + void slotChangeStyle(const TQString & ); void cutomize_chosen_slot(); protected: @@ -351,11 +359,11 @@ protected: /* the pattern box that is the 'preview' of what is selected above. */ PatternSelect* preview; - QComboBox* size; - QComboBox* style; + TQComboBox* size; + TQComboBox* style; KColorButton* color; - QCheckBox* customize; - QColor currentColor; + TQCheckBox* customize; + TQColor currentColor; Border *area; CellFormatDialog *dlg; private: @@ -374,17 +382,18 @@ private: void applyDiagonalOutline(FormatManipulator* obj); }; -class BrushSelect : public QFrame +class BrushSelect : public TQFrame { Q_OBJECT + TQ_OBJECT public: - BrushSelect( QWidget *parent, const char *_name ); + BrushSelect( TQWidget *tqparent, const char *_name ); - void setBrushStyle( BrushStyle _pat ) { brushStyle = _pat; repaint(); } - BrushStyle getBrushStyle() const { return brushStyle; } - QColor getBrushColor() const { return brushColor; } - void setBrushColor(const QColor &_c) { brushColor=_c;} - void setPattern( const QColor &_color, BrushStyle _style ); + void setBrushStyle( Qt::BrushStyle _pat ) { brushStyle = _pat; tqrepaint(); } + Qt::BrushStyle getBrushStyle() const { return brushStyle; } + TQColor getBrushColor() const { return brushColor; } + void setBrushColor(const TQColor &_c) { brushColor=_c;} + void setPattern( const TQColor &_color, Qt::BrushStyle _style ); signals: void clicked( BrushSelect *_this ); @@ -394,20 +403,21 @@ public slots: void slotSelect(); protected: - virtual void paintEvent( QPaintEvent *_ev ); - virtual void mousePressEvent( QMouseEvent *_ev ); + virtual void paintEvent( TQPaintEvent *_ev ); + virtual void mousePressEvent( TQMouseEvent *_ev ); - BrushStyle brushStyle; - QColor brushColor; + Qt::BrushStyle brushStyle; + TQColor brushColor; bool selected; }; -class CellFormatPagePattern : public QWidget +class CellFormatPagePattern : public TQWidget { Q_OBJECT + TQ_OBJECT public: - CellFormatPagePattern( QWidget *parent, CellFormatDialog *_dlg ); + CellFormatPagePattern( TQWidget *tqparent, CellFormatDialog *_dlg ); void apply( CustomStyle * style ); void apply( FormatManipulator *_obj ); @@ -415,8 +425,8 @@ public: void init(); public slots: void slotUnselect2( BrushSelect *_select ); - void slotSetColorButton( const QColor &_color ); - void slotSetBackgroundColor( const QColor &_color ); + void slotSetColorButton( const TQColor &_color ); + void slotSetBackgroundColor( const TQColor &_color ); void slotNotAnyColor( ); protected: BrushSelect *selectedBrush; @@ -437,10 +447,10 @@ protected: BrushSelect *brush15; BrushSelect *current; KColorButton* color; - QPushButton* notAnyColor; - QColor currentColor; + TQPushButton* notAnyColor; + TQColor currentColor; - QColor bgColor; + TQColor bgColor; bool bBgColorUndefined; KColorButton *bgColorButton; bool b_notAnyColor; @@ -450,9 +460,10 @@ protected: class CellFormatPageProtection : public ProtectionTab { Q_OBJECT + TQ_OBJECT public: - CellFormatPageProtection( QWidget * parent, CellFormatDialog * _dlg ); + CellFormatPageProtection( TQWidget * tqparent, CellFormatDialog * _dlg ); ~CellFormatPageProtection(); ///when protection is set through Style Manager void apply( CustomStyle * style ); @@ -469,9 +480,10 @@ class CellFormatPageProtection : public ProtectionTab /** * Dialog for the "Cell Format..." action */ -class CellFormatDialog : public QObject +class CellFormatDialog : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Create a format dlg for the rectangular area in '_sheet'. @@ -504,7 +516,7 @@ public: StyleManager * getStyleManager() const { return m_styleManager; } bool isSingleCell() { return ( left == right && top == bottom ); } - bool checkCircle( QString const & name, QString const & parent ); + bool checkCircle( TQString const & name, TQString const & tqparent ); KLocale * locale() const { return m_pView->doc()->locale(); } @@ -513,22 +525,22 @@ public: { int width; bool bStyle; - QColor color; + TQColor color; bool bColor; - PenStyle style; + Qt::PenStyle style; }; // The format of the selected area CellBorderFormat borders[BorderType_END]; - BrushStyle brushStyle; - QColor brushColor; + Qt::BrushStyle brushStyle; + TQColor brushColor; bool oneCol; bool oneRow; - QString prefix; - QString postfix; + TQString prefix; + TQString postfix; int precision; Format::FloatFormat floatFormat; bool bFloatFormat; @@ -536,7 +548,7 @@ public: Format::Currency cCurrency; bool bFloatColor; bool bCurrency; - QColor textColor; + TQColor textColor; bool bTextColor; bool bTextFontBold; bool textFontBold; @@ -545,19 +557,19 @@ public: bool bTextFontSize; int textFontSize; bool bTextFontFamily; - QString textFontFamily; + TQString textFontFamily; bool bStrike; bool strike; bool bUnderline; bool underline; - QFont textFont; - QColor bgColor; + TQFont textFont; + TQColor bgColor; bool bBgColor; - QString actionText; + TQString actionText; Format::Align alignX; Format::AlignY alignY; - QString styleName; - QString styleParent; + TQString styleName; + TQString styleParent; bool bMultiRow; bool bVerticalText; @@ -574,11 +586,11 @@ public: double indent; - QPixmap* formatOnlyNegSignedPixmap; - QPixmap* formatRedOnlyNegSignedPixmap; - QPixmap* formatRedNeverSignedPixmap; - QPixmap* formatAlwaysSignedPixmap; - QPixmap* formatRedAlwaysSignedPixmap; + TQPixmap* formatOnlyNegSignedPixmap; + TQPixmap* formatRedOnlyNegSignedPixmap; + TQPixmap* formatRedNeverSignedPixmap; + TQPixmap* formatAlwaysSignedPixmap; + TQPixmap* formatRedAlwaysSignedPixmap; int textRotation; bool bTextRotation; @@ -610,8 +622,8 @@ protected: * Draws a pixmap showing a text consisting of two parts, @p _string1 and @p _string2 . * The parts' colors are given by @p _color1 and @p _color2 . */ - QPixmap* paintFormatPixmap( const char *_string1, const QColor & _color1, - const char *_string2, const QColor & _color2 ); + TQPixmap* paintFormatPixmap( const char *_string1, const TQColor & _color1, + const char *_string2, const TQColor & _color2 ); GeneralTab * generalPage; CellFormatPageFloat *floatPage; @@ -620,7 +632,7 @@ protected: CellFormatPagePosition *positionPage; CellFormatPagePattern *patternPage; CellFormatPageProtection *protectPage; - QTabDialog *tab; + TQTabDialog *tab; Doc * m_doc; Sheet * m_sheet; diff --git a/kspread/dialogs/kspread_dlg_list.cc b/kspread/dialogs/kspread_dlg_list.cc index bb3c75e95..83eb54c9c 100644 --- a/kspread/dialogs/kspread_dlg_list.cc +++ b/kspread/dialogs/kspread_dlg_list.cc @@ -19,12 +19,12 @@ * Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qlistbox.h> -#include <qmultilineedit.h> -#include <qpushbutton.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqlistbox.h> +#include <tqmultilineedit.h> +#include <tqpushbutton.h> #include <kbuttonbox.h> #include <kconfig.h> @@ -39,53 +39,53 @@ using namespace KSpread; -ListDialog::ListDialog( QWidget* parent, const char* name ) - : KDialogBase( parent, name, true, i18n("Custom Lists"), Ok|Cancel ) +ListDialog::ListDialog( TQWidget* tqparent, const char* name ) + : KDialogBase( tqparent, name, true, i18n("Custom Lists"), Ok|Cancel ) { - QWidget* page = new QWidget( this ); + TQWidget* page = new TQWidget( this ); setMainWidget( page ); - QGridLayout *grid1 = new QGridLayout( page,10,3,KDialog::marginHint(), KDialog::spacingHint()); + TQGridLayout *grid1 = new TQGridLayout( page,10,3,KDialog::marginHint(), KDialog::spacingHint()); - QLabel *lab=new QLabel(page); + TQLabel *lab=new TQLabel(page); lab->setText(i18n("List:" )); grid1->addWidget(lab,0,0); - list=new QListBox(page); + list=new TQListBox(page); grid1->addMultiCellWidget(list,1,8,0,0); - lab=new QLabel(page); + lab=new TQLabel(page); lab->setText(i18n("Entry:" )); grid1->addWidget(lab,0,1); - entryList=new QMultiLineEdit(page); + entryList=new TQMultiLineEdit(page); grid1->addMultiCellWidget(entryList,1,8,1,1); - m_pRemove=new QPushButton(i18n("&Remove"),page); + m_pRemove=new TQPushButton(i18n("&Remove"),page); grid1->addWidget(m_pRemove,3,2); - m_pAdd=new QPushButton(i18n("&Add"),page); + m_pAdd=new TQPushButton(i18n("&Add"),page); grid1->addWidget(m_pAdd,1,2); - m_pNew=new QPushButton(i18n("&New"),page); + m_pNew=new TQPushButton(i18n("&New"),page); grid1->addWidget(m_pNew,2,2); - m_pModify=new QPushButton(i18n("&Modify"),page); + m_pModify=new TQPushButton(i18n("&Modify"),page); grid1->addWidget(m_pModify,4,2); - m_pCopy=new QPushButton(i18n("Co&py"),page); + m_pCopy=new TQPushButton(i18n("Co&py"),page); grid1->addWidget(m_pCopy,5,2); m_pAdd->setEnabled(false); - connect( m_pRemove, SIGNAL( clicked() ), this, SLOT( slotRemove() ) ); - connect( m_pAdd, SIGNAL( clicked() ), this, SLOT( slotAdd() ) ); - connect( m_pNew, SIGNAL( clicked() ), this, SLOT( slotNew() ) ); - connect( m_pModify, SIGNAL( clicked() ), this, SLOT( slotModify() ) ); - connect( m_pCopy, SIGNAL( clicked() ), this, SLOT( slotCopy() ) ); - connect( list, SIGNAL(doubleClicked(QListBoxItem *)),this,SLOT(slotDoubleClicked(QListBoxItem *))); - connect( list, SIGNAL(clicked ( QListBoxItem * )),this,SLOT(slotTextClicked(QListBoxItem * ))); + connect( m_pRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemove() ) ); + connect( m_pAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdd() ) ); + connect( m_pNew, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotNew() ) ); + connect( m_pModify, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotModify() ) ); + connect( m_pCopy, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) ); + connect( list, TQT_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQT_SLOT(slotDoubleClicked(TQListBoxItem *))); + connect( list, TQT_SIGNAL(clicked ( TQListBoxItem * )),this,TQT_SLOT(slotTextClicked(TQListBoxItem * ))); init(); entryList->setEnabled(false); m_pModify->setEnabled(false); @@ -96,7 +96,7 @@ ListDialog::ListDialog( QWidget* parent, const char* name ) } -void ListDialog::slotTextClicked(QListBoxItem*) +void ListDialog::slotTextClicked(TQListBoxItem*) { //we can't remove the two first item bool state=list->currentItem()>1; @@ -107,7 +107,7 @@ void ListDialog::slotTextClicked(QListBoxItem*) void ListDialog::init() { - QString month; + TQString month; month+=i18n("January")+", "; month+=i18n("February")+", "; month+=i18n("March") +", "; @@ -120,10 +120,10 @@ void ListDialog::init() month+=i18n("October")+", "; month+=i18n("November")+", "; month+=i18n("December"); - QStringList lst; + TQStringList lst; lst.append(month); - QString smonth; + TQString smonth; smonth+=i18n("Jan")+", "; smonth+=i18n("Feb")+", "; smonth+=i18n("Mar") +", "; @@ -138,7 +138,7 @@ void ListDialog::init() smonth+=i18n("Dec"); lst.append(smonth); - QString day=i18n("Monday")+", "; + TQString day=i18n("Monday")+", "; day+=i18n("Tuesday")+", "; day+=i18n("Wednesday")+", "; day+=i18n("Thursday")+", "; @@ -147,7 +147,7 @@ void ListDialog::init() day+=i18n("Sunday"); lst.append(day); - QString sday=i18n("Mon")+", "; + TQString sday=i18n("Mon")+", "; sday+=i18n("Tue")+", "; sday+=i18n("Wed")+", "; sday+=i18n("Thu")+", "; @@ -158,9 +158,9 @@ void ListDialog::init() config = Factory::global()->config(); config->setGroup( "Parameters" ); - QStringList other=config->readListEntry("Other list"); - QString tmp; - for ( QStringList::Iterator it = other.begin(); it != other.end();++it ) + TQStringList other=config->readListEntry("Other list"); + TQString tmp; + for ( TQStringList::Iterator it = other.begin(); it != other.end();++it ) { if((*it)!="\\") tmp+=(*it)+", "; @@ -174,16 +174,16 @@ void ListDialog::init() list->insertStringList(lst); } -void ListDialog::slotDoubleClicked(QListBoxItem *) +void ListDialog::slotDoubleClicked(TQListBoxItem *) { //we can't modify the two first item if(list->currentItem()<2) return; - QString tmp=list->currentText(); + TQString tmp=list->currentText(); entryList->setText(""); - QStringList result=result.split(", ",tmp); + TQStringList result=result.split(", ",tmp); int index=0; - for ( QStringList::Iterator it = result.begin(); it != result.end();++it ) + for ( TQStringList::Iterator it = result.begin(); it != result.end();++it ) { entryList->insertLine((*it),index); index++; @@ -196,7 +196,7 @@ void ListDialog::slotAdd() { m_pAdd->setEnabled(false); list->setEnabled(true); - QString tmp; + TQString tmp; for(int i=0;i<entryList->numLines();i++) { if(!entryList->textLine(i).isEmpty()) @@ -254,13 +254,13 @@ void ListDialog::slotOk() } if(m_bChanged) { - QStringList result; + TQStringList result; result.append("\\"); //don't save the two first line for(unsigned int i=2;i<list->count();i++) { - QStringList tmp=result.split(", ",list->text(i)); + TQStringList tmp=result.split(", ",list->text(i)); if ( !tmp.isEmpty() ) { result+=tmp; @@ -285,7 +285,7 @@ void ListDialog::slotModify() //you can modify list but not the two first list if(list->currentItem ()>1 && !entryList->text().isEmpty()) { - QString tmp; + TQString tmp; for(int i=0;i<entryList->numLines();i++) { if(!entryList->textLine(i).isEmpty()) diff --git a/kspread/dialogs/kspread_dlg_list.h b/kspread/dialogs/kspread_dlg_list.h index 88d3c2430..714186bbb 100644 --- a/kspread/dialogs/kspread_dlg_list.h +++ b/kspread/dialogs/kspread_dlg_list.h @@ -24,11 +24,11 @@ #include <kdialogbase.h> -class QListBox; -class QListBoxItem; -class QLineEdit; -class QMultiLineEdit; -class QPushButton; +class TQListBox; +class TQListBoxItem; +class TQLineEdit; +class TQMultiLineEdit; +class TQPushButton; class KConfig; @@ -38,15 +38,16 @@ namespace KSpread class ListDialog: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ListDialog( QWidget* parent, const char* name ); + ListDialog( TQWidget* tqparent, const char* name ); void init(); public slots: virtual void slotOk(); - void slotDoubleClicked(QListBoxItem *); - void slotTextClicked(QListBoxItem*); + void slotDoubleClicked(TQListBoxItem *); + void slotTextClicked(TQListBoxItem*); void slotRemove(); void slotAdd(); void slotNew(); @@ -56,13 +57,13 @@ public slots: protected: KConfig *config; - QListBox * list; - QMultiLineEdit *entryList; - QPushButton* m_pRemove; - QPushButton* m_pNew; - QPushButton* m_pAdd; - QPushButton* m_pModify; - QPushButton* m_pCopy; + TQListBox * list; + TQMultiLineEdit *entryList; + TQPushButton* m_pRemove; + TQPushButton* m_pNew; + TQPushButton* m_pAdd; + TQPushButton* m_pModify; + TQPushButton* m_pCopy; bool m_bChanged; }; diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc index 771cee5b1..6c277be66 100644 --- a/kspread/dialogs/kspread_dlg_paperlayout.cc +++ b/kspread/dialogs/kspread_dlg_paperlayout.cc @@ -31,14 +31,14 @@ #include <kspread_view.h> #include <selection.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qcombobox.h> -#include <qlayout.h> -#include <qhgroupbox.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqhgroupbox.h> #include <kapplication.h> #include <kdebug.h> @@ -47,19 +47,19 @@ using namespace KSpread; -PaperLayout::PaperLayout( QWidget * parent, const char * name, - const KoPageLayout & layout, +PaperLayout::PaperLayout( TQWidget * tqparent, const char * name, + const KoPageLayout & tqlayout, const KoHeadFoot & headfoot, int tabs, KoUnit::Unit unit, Sheet * sheet, View * view) - : KoPageLayoutDia( parent, name, layout, headfoot, tabs, unit, false /*no modal*/), + : KoPageLayoutDia( tqparent, name, tqlayout, headfoot, tabs, unit, false /*no modal*/), m_pSheet( sheet ), m_pView( view ) { initTab(); - connect(view->selectionInfo(), SIGNAL(changed(const Region&)), - this, SLOT(slotSelectionChanged())); - qApp->installEventFilter( this ); + connect(view->selectionInfo(), TQT_SIGNAL(changed(const Region&)), + this, TQT_SLOT(slotSelectionChanged())); + tqApp->installEventFilter( this ); m_focus= 0L; } @@ -67,10 +67,10 @@ void PaperLayout::initTab() { SheetPrint* print = m_pSheet->print(); - QWidget *tab = addPage(i18n( "Options" )); - QVBoxLayout *vbox = new QVBoxLayout( tab, KDialog::marginHint(), KDialog::spacingHint() ); + TQWidget *tab = addPage(i18n( "Options" )); + TQVBoxLayout *vbox = new TQVBoxLayout( tab, KDialog::marginHint(), KDialog::spacingHint() ); - pApplyToAll = new QCheckBox ( i18n( "&Apply to all sheets" ), tab ); + pApplyToAll = new TQCheckBox ( i18n( "&Apply to all sheets" ), tab ); pApplyToAll->setChecked( print->printGrid() ); vbox->addWidget( pApplyToAll ); @@ -86,76 +86,76 @@ void PaperLayout::initTab() vbox->addStretch( 1 ); } -void PaperLayout::initGeneralOptions( QWidget * tab, QVBoxLayout * vbox ) +void PaperLayout::initGeneralOptions( TQWidget * tab, TQVBoxLayout * vbox ) { SheetPrint* print = m_pSheet->print(); - QGroupBox *group = new QGroupBox( i18n("General Options"), tab ); - QGridLayout *l = new QGridLayout( group, 2, 3 ); + TQGroupBox *group = new TQGroupBox( i18n("General Options"), tab ); + TQGridLayout *l = new TQGridLayout( group, 2, 3 ); - pPrintGrid = new QCheckBox ( i18n("Print &grid"), group ); + pPrintGrid = new TQCheckBox ( i18n("Print &grid"), group ); pPrintGrid->setChecked( print->printGrid() ); l->addWidget( pPrintGrid, 0, 0 ); - pPrintCommentIndicator = new QCheckBox ( i18n("Print &comment indicator"), group ); + pPrintCommentIndicator = new TQCheckBox ( i18n("Print &comment indicator"), group ); pPrintCommentIndicator->setChecked( print->printCommentIndicator() ); l->addWidget( pPrintCommentIndicator, 0, 1 ); - pPrintFormulaIndicator = new QCheckBox ( i18n("Print &formula indicator"), group ); + pPrintFormulaIndicator = new TQCheckBox ( i18n("Print &formula indicator"), group ); pPrintFormulaIndicator->setChecked( print->printFormulaIndicator() ); l->addWidget( pPrintFormulaIndicator, 0, 2 ); - pPrintObjects = new QCheckBox ( i18n("Print &objects"), group ); + pPrintObjects = new TQCheckBox ( i18n("Print &objects"), group ); pPrintObjects->setChecked( print->printObjects() ); l->addWidget( pPrintObjects, 1, 0 ); - pPrintCharts = new QCheckBox ( i18n("Print &charts"), group ); + pPrintCharts = new TQCheckBox ( i18n("Print &charts"), group ); pPrintCharts->setChecked( print->printCharts() ); l->addWidget( pPrintCharts, 1, 1 ); // Not used yet unless someone implement some kind of drawing object -// pPrintGraphics = new QCheckBox ( i18n("Print &drawings"), group ); +// pPrintGraphics = new TQCheckBox ( i18n("Print &drawings"), group ); // pPrintGraphics->setChecked( print->printGraphics() ); // l->addWidget( pPrintGraphics, 1, 2 ); vbox->addWidget( group ); } -void PaperLayout::initRanges( QWidget * tab, QVBoxLayout * vbox ) +void PaperLayout::initRanges( TQWidget * tab, TQVBoxLayout * vbox ) { SheetPrint* print = m_pSheet->print(); - QGroupBox *rangeGroup = new QGroupBox( i18n("Ranges"), tab ); + TQGroupBox *rangeGroup = new TQGroupBox( i18n("Ranges"), tab ); rangeGroup->setColumnLayout( 0, Qt::Vertical ); rangeGroup->setMargin( KDialog::marginHint() ); vbox->addWidget( rangeGroup ); - QGridLayout *grid = new QGridLayout( rangeGroup->layout(), 3, 2, KDialog::spacingHint() ); + TQGridLayout *grid = new TQGridLayout( rangeGroup->tqlayout(), 3, 2, KDialog::spacingHint() ); - QLabel *pPrintRange = new QLabel ( i18n("Print range:"), rangeGroup ); + TQLabel *pPrintRange = new TQLabel ( i18n("Print range:"), rangeGroup ); grid->addWidget( pPrintRange, 0, 0 ); - ePrintRange = new QLineEdit( rangeGroup ); + ePrintRange = new TQLineEdit( rangeGroup ); ePrintRange->setText( util_rangeName( print->printRange() ) ); grid->addWidget( ePrintRange, 0, 1 ); - QLabel *pRepeatCols = new QLabel ( i18n("Repeat columns on each page:"), rangeGroup ); + TQLabel *pRepeatCols = new TQLabel ( i18n("Repeat columns on each page:"), rangeGroup ); grid->addWidget( pRepeatCols, 1, 0 ); - eRepeatCols = new QLineEdit( rangeGroup ); + eRepeatCols = new TQLineEdit( rangeGroup ); if ( print->printRepeatColumns().first != 0 ) eRepeatCols->setText( Cell::columnName( print->printRepeatColumns().first ) + ":" + Cell::columnName( print->printRepeatColumns().second ) ); grid->addWidget( eRepeatCols, 1, 1 ); - QLabel *pRepeatRows = new QLabel ( i18n("Repeat rows on each page:"), rangeGroup ); + TQLabel *pRepeatRows = new TQLabel ( i18n("Repeat rows on each page:"), rangeGroup ); grid->addWidget( pRepeatRows, 2, 0 ); - eRepeatRows = new QLineEdit( rangeGroup ); + eRepeatRows = new TQLineEdit( rangeGroup ); if ( print->printRepeatRows().first != 0 ) - eRepeatRows->setText( QString().setNum( print->printRepeatRows().first ) + + eRepeatRows->setText( TQString().setNum( print->printRepeatRows().first ) + ":" + - QString().setNum( print->printRepeatRows().second ) ); + TQString().setNum( print->printRepeatRows().second ) ); grid->addWidget( eRepeatRows, 2, 1 ); grid->addColSpacing( 0, pPrintRange->width() ); @@ -173,65 +173,65 @@ void PaperLayout::initRanges( QWidget * tab, QVBoxLayout * vbox ) grid->addRowSpacing( 2, eRepeatCols->height() ); } -void PaperLayout::initScaleOptions( QWidget * tab, QVBoxLayout * vbox ) +void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox ) { SheetPrint* print = m_pSheet->print(); - QButtonGroup *zoomGroup = new QButtonGroup( i18n("Scale Printout"), tab ); + TQButtonGroup *zoomGroup = new TQButtonGroup( i18n("Scale Printout"), tab ); zoomGroup->setColumnLayout( 0, Qt::Vertical ); zoomGroup->setMargin( KDialog::marginHint() ); vbox->addWidget( zoomGroup ); - QGridLayout *grid = new QGridLayout( zoomGroup->layout(), 2, 6, + TQGridLayout *grid = new TQGridLayout( zoomGroup->tqlayout(), 2, 6, KDialog::spacingHint() ); - m_rScalingZoom = new QRadioButton ( i18n("Zoom:"), zoomGroup ); + m_rScalingZoom = new TQRadioButton ( i18n("Zoom:"), zoomGroup ); grid->addWidget( m_rScalingZoom, 0, 0 ); - m_cZoom = new QComboBox( true, zoomGroup, "Zoom" ); - grid->addMultiCellWidget( m_cZoom, 0, 0, 1, 5, Qt::AlignLeft ); + m_cZoom = new TQComboBox( true, zoomGroup, "Zoom" ); + grid->addMultiCellWidget( m_cZoom, 0, 0, 1, 5, TQt::AlignLeft ); - QStringList lst; + TQStringList lst; for( int i = 5; i < 500; i += 5 ) { - lst.append( QString( i18n( "%1%" ) ).arg( i ) ); - if( qRound( print->zoom() * 100 ) > i && - qRound( print->zoom() * 100 ) < i + 5 ) + lst.append( TQString( i18n( "%1%" ) ).tqarg( i ) ); + if( tqRound( print->zoom() * 100 ) > i && + tqRound( print->zoom() * 100 ) < i + 5 ) { - lst.append( QString( i18n( "%1%" ) ).arg( qRound( print->zoom() * 100 ) ) ); + lst.append( TQString( i18n( "%1%" ) ).tqarg( tqRound( print->zoom() * 100 ) ) ); } } m_cZoom->insertStringList( lst ); int number_of_entries = m_cZoom->count(); - QString string = QString( i18n( "%1%" ) ).arg( qRound( print->zoom() * 100 ) ); + TQString string = TQString( i18n( "%1%" ) ).tqarg( tqRound( print->zoom() * 100 ) ); for (int i = 0; i < number_of_entries ; i++) { - if ( string == (QString) m_cZoom->text(i) ) + if ( string == (TQString) m_cZoom->text(i) ) { m_cZoom->setCurrentItem( i ); break; } } - m_rScalingLimitPages = new QRadioButton ( i18n("Limit pages:"), zoomGroup ); + m_rScalingLimitPages = new TQRadioButton ( i18n("Limit pages:"), zoomGroup ); grid->addWidget( m_rScalingLimitPages, 1, 0 ); - QLabel *pLimitPagesX = new QLabel ( i18n("X:"), zoomGroup ); + TQLabel *pLimitPagesX = new TQLabel ( i18n("X:"), zoomGroup ); grid->addWidget( pLimitPagesX, 1, 1 ); - m_cLimitPagesX = new QComboBox( true, zoomGroup, "pagesX" ); + m_cLimitPagesX = new TQComboBox( true, zoomGroup, "pagesX" ); grid->addWidget( m_cLimitPagesX, 1, 2 ); - QStringList lstX; + TQStringList lstX; lstX.append( i18n( "No Limit" ) ); for( int i = 1; i <= 20; i += 1 ) { - lstX.append( QString( "%1" ).arg( i ) ); + lstX.append( TQString( "%1" ).tqarg( i ) ); } if( print->pageLimitX() > 20 ) { - lstX.append( QString( "%1" ).arg( print->pageLimitX() ) ); + lstX.append( TQString( "%1" ).tqarg( print->pageLimitX() ) ); } m_cLimitPagesX->insertStringList( lstX ); @@ -240,21 +240,21 @@ void PaperLayout::initScaleOptions( QWidget * tab, QVBoxLayout * vbox ) else m_cLimitPagesX->setCurrentItem( 21 ); - QLabel *pLimitPagesY = new QLabel ( i18n("Y:"), zoomGroup ); + TQLabel *pLimitPagesY = new TQLabel ( i18n("Y:"), zoomGroup ); grid->addWidget( pLimitPagesY, 1, 3 ); - m_cLimitPagesY = new QComboBox( true, zoomGroup, "pagesY" ); + m_cLimitPagesY = new TQComboBox( true, zoomGroup, "pagesY" ); grid->addWidget( m_cLimitPagesY, 1, 4 ); - QStringList lstY; + TQStringList lstY; lstY.append( i18n( "No Limit" ) ); for( int i = 1; i <= 20; i += 1 ) { - lstY.append( QString( "%1" ).arg( i ) ); + lstY.append( TQString( "%1" ).tqarg( i ) ); } if( print->pageLimitY() > 20 ) { - lstY.append( QString( "%1" ).arg( print->pageLimitY() ) ); + lstY.append( TQString( "%1" ).tqarg( print->pageLimitY() ) ); } m_cLimitPagesY->insertStringList( lstY ); @@ -272,9 +272,9 @@ void PaperLayout::initScaleOptions( QWidget * tab, QVBoxLayout * vbox ) m_rScalingZoom->setChecked( true ); } - connect( m_cZoom, SIGNAL( activated( int ) ), this, SLOT( slotChooseZoom( int ) ) ); - connect( m_cLimitPagesX, SIGNAL( activated( int ) ), this, SLOT( slotChoosePageLimit( int ) ) ); - connect( m_cLimitPagesY, SIGNAL( activated( int ) ), this, SLOT( slotChoosePageLimit( int ) ) ); + connect( m_cZoom, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotChooseZoom( int ) ) ); + connect( m_cLimitPagesX, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotChoosePageLimit( int ) ) ); + connect( m_cLimitPagesY, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotChoosePageLimit( int ) ) ); } void PaperLayout::slotChooseZoom( int /*index*/ ) @@ -312,7 +312,7 @@ void PaperLayout::slotOk() { SheetPrint *print = sheet->print(); - KoPageLayout pl = layout(); + KoPageLayout pl = tqlayout(); KoHeadFoot hf = headFoot(); KoUnit::Unit unit = sheet->doc()->unit(); print->setPrintGrid( pPrintGrid->isChecked() ); @@ -321,17 +321,17 @@ void PaperLayout::slotOk() print->setPrintObjects( pPrintObjects->isChecked() ); print->setPrintCharts( pPrintCharts->isChecked() ); // print->setPrintGraphics( pPrintGraphics->isChecked() ); - QString tmpPrintRange = ePrintRange->text(); - QString tmpRepeatCols = eRepeatCols->text(); - QString tmpRepeatRows = eRepeatRows->text(); + TQString tmpPrintRange = ePrintRange->text(); + TQString tmpRepeatCols = eRepeatCols->text(); + TQString tmpRepeatRows = eRepeatRows->text(); if ( tmpPrintRange.isEmpty() ) { - print->setPrintRange( QRect( QPoint( 1, 1 ), QPoint( KS_colMax, KS_rowMax ) ) ); + print->setPrintRange( TQRect( TQPoint( 1, 1 ), TQPoint( KS_colMax, KS_rowMax ) ) ); } else { bool error = true; - int first = tmpPrintRange.find(":"); + int first = tmpPrintRange.tqfind(":"); if ( ( first != -1 ) && ( (int)tmpPrintRange.length() > first ) ) { Point point1 ( tmpPrintRange.left( first ) ); @@ -341,10 +341,10 @@ void PaperLayout::slotOk() if ( point2.isValid() ) { error = false; - print->setPrintRange ( QRect( QPoint( QMIN( point1.pos().x(), point2.pos().x() ), - QMIN( point1.pos().y(), point2.pos().y() ) ), - QPoint( QMAX( point1.pos().x(), point2.pos().x() ), - QMAX( point1.pos().y(), point2.pos().y() ) ) ) ); + print->setPrintRange ( TQRect( TQPoint( TQMIN( point1.pos().x(), point2.pos().x() ), + TQMIN( point1.pos().y(), point2.pos().y() ) ), + TQPoint( TQMAX( point1.pos().x(), point2.pos().x() ), + TQMAX( point1.pos().y(), point2.pos().y() ) ) ) ); } } } @@ -354,12 +354,12 @@ void PaperLayout::slotOk() if ( tmpRepeatCols.isEmpty() ) { - print->setPrintRepeatColumns( qMakePair( 0, 0 ) ); + print->setPrintRepeatColumns( tqMakePair( 0, 0 ) ); } else { bool error = true; - int first = tmpRepeatCols.find(":"); + int first = tmpRepeatCols.tqfind(":"); if ( ( first != -1 ) && ( (int)tmpRepeatCols.length() > first ) ) { int col1 = util_decodeColumnLabelText( tmpRepeatCols.left( first ) ); @@ -369,7 +369,7 @@ void PaperLayout::slotOk() if ( col2 > 0 && col2 <= KS_colMax ) { error = false; - print->setPrintRepeatColumns ( qMakePair( col1, col2 ) ); + print->setPrintRepeatColumns ( tqMakePair( col1, col2 ) ); } } } @@ -380,12 +380,12 @@ void PaperLayout::slotOk() if ( tmpRepeatRows.isEmpty() ) { - print->setPrintRepeatRows ( qMakePair( 0, 0 ) ); + print->setPrintRepeatRows ( tqMakePair( 0, 0 ) ); } else { bool error = true; - int first = tmpRepeatRows.find(":"); + int first = tmpRepeatRows.tqfind(":"); if ( ( first != -1 ) && ( (int)tmpRepeatRows.length() > first ) ) { int row1 = tmpRepeatRows.left( first ).toInt(); @@ -395,7 +395,7 @@ void PaperLayout::slotOk() if ( row2 > 0 && row2 <= KS_rowMax ) { error = false; - print->setPrintRepeatRows ( qMakePair( row1, row2 ) ); + print->setPrintRepeatRows ( tqMakePair( row1, row2 ) ); } } } @@ -407,11 +407,11 @@ void PaperLayout::slotOk() if ( m_rScalingZoom->isChecked() ) { kdDebug() << "Zoom is selected" << endl; - if( QString( "%1%" ).arg( qRound( print->zoom() * 100 ) ) != m_cZoom->currentText() ) + if( TQString( "%1%" ).tqarg( tqRound( print->zoom() * 100 ) ) != m_cZoom->currentText() ) { kdDebug() << "New zoom is different than original: " << m_cZoom->currentText() << endl; - QString zoomtext = m_cZoom->currentText(); - zoomtext.replace("%",""); + TQString zoomtext = m_cZoom->currentText(); + zoomtext.tqreplace("%",""); bool convertok = false; double zoomvalue = zoomtext.toDouble(&convertok); if (!convertok) @@ -478,8 +478,8 @@ void PaperLayout::slotOk() if ( pl.format == PG_CUSTOM ) { - print->setPaperWidth( qRound( POINT_TO_MM( pl.ptWidth ) *1000 ) / 1000 ); - print->setPaperHeight( qRound( POINT_TO_MM( pl.ptHeight ) *1000 ) / 1000 ); + print->setPaperWidth( tqRound( POINT_TO_MM( pl.ptWidth ) *1000 ) / 1000 ); + print->setPaperHeight( tqRound( POINT_TO_MM( pl.ptHeight ) *1000 ) / 1000 ); } print->setPaperLayout( POINT_TO_MM(pl.ptLeft), POINT_TO_MM(pl.ptTop), @@ -505,7 +505,7 @@ void PaperLayout::slotOk() accept(); } -void PaperLayout::closeEvent ( QCloseEvent * ) +void PaperLayout::closeEvent ( TQCloseEvent * ) { delete this; } @@ -516,7 +516,7 @@ void PaperLayout::slotSelectionChanged() if (!m_pView->selectionInfo()->isValid()) return; - QString area = util_rangeName( m_pView->selectionInfo()->lastRange() ); + TQString area = util_rangeName( m_pView->selectionInfo()->lastRange() ); if ( m_focus ) { if ( m_focus == ePrintRange ) @@ -536,13 +536,13 @@ void PaperLayout::slotCancel() reject(); } -bool PaperLayout::eventFilter( QObject* obj, QEvent* ev ) +bool PaperLayout::eventFilter( TQObject* obj, TQEvent* ev ) { - if ( obj == ePrintRange && ev->type() == QEvent::FocusIn ) + if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(ePrintRange) && ev->type() == TQEvent::FocusIn ) m_focus = ePrintRange; - else if ( obj == eRepeatCols && ev->type() == QEvent::FocusIn ) + else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(eRepeatCols) && ev->type() == TQEvent::FocusIn ) m_focus = eRepeatCols; - else if ( obj == eRepeatRows && ev->type() == QEvent::FocusIn ) + else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(eRepeatRows) && ev->type() == TQEvent::FocusIn ) m_focus = eRepeatRows; else return false; diff --git a/kspread/dialogs/kspread_dlg_paperlayout.h b/kspread/dialogs/kspread_dlg_paperlayout.h index 93981628e..a7316f22c 100644 --- a/kspread/dialogs/kspread_dlg_paperlayout.h +++ b/kspread/dialogs/kspread_dlg_paperlayout.h @@ -20,16 +20,16 @@ * Boston, MA 02110-1301, USA. */ -#ifndef __kspread_dlg_paperlayout__ -#define __kspread_dlg_paperlayout__ +#ifndef __kspread_dlg_papertqlayout__ +#define __kspread_dlg_papertqlayout__ #include <kdialogbase.h> #include <KoPageLayoutDia.h> -class QCheckBox; -class QComboBox; -class QRadioButton; -class QLineEdit; +class TQCheckBox; +class TQComboBox; +class TQRadioButton; +class TQLineEdit; namespace KSpread { @@ -39,14 +39,15 @@ class View; class PaperLayout: public KoPageLayoutDia { Q_OBJECT + TQ_OBJECT public: - PaperLayout( QWidget* parent, const char* name, - const KoPageLayout& layout, + PaperLayout( TQWidget* tqparent, const char* name, + const KoPageLayout& tqlayout, const KoHeadFoot& headfoot, int tabs, KoUnit::Unit unit, Sheet * sheet, View *view); - bool eventFilter( QObject* obj, QEvent* ev ); + bool eventFilter( TQObject* obj, TQEvent* ev ); protected slots: virtual void slotOk(); @@ -57,36 +58,36 @@ protected: void initTab(); protected: - virtual void closeEvent ( QCloseEvent * ); + virtual void closeEvent ( TQCloseEvent * ); private slots: void slotChooseZoom( int index ); void slotChoosePageLimit( int index ); private: - void initGeneralOptions( QWidget * tab, QVBoxLayout * vbox ); - void initRanges( QWidget * tab, QVBoxLayout * vbox ); - void initScaleOptions( QWidget * tab, QVBoxLayout * vbox ); + void initGeneralOptions( TQWidget * tab, TQVBoxLayout * vbox ); + void initRanges( TQWidget * tab, TQVBoxLayout * vbox ); + void initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox ); Sheet * m_pSheet; View * m_pView; - QCheckBox * pApplyToAll; - QCheckBox * pPrintGrid; - QCheckBox * pPrintCommentIndicator; - QCheckBox * pPrintFormulaIndicator; - QCheckBox * pPrintObjects; - QCheckBox * pPrintCharts; - QCheckBox * pPrintGraphics; - QLineEdit * ePrintRange; - QLineEdit * eRepeatCols; - QLineEdit * eRepeatRows; - QLineEdit * m_focus; - QComboBox * m_cZoom; - QComboBox * m_cLimitPagesX; - QComboBox * m_cLimitPagesY; - QRadioButton * m_rScalingZoom; - QRadioButton * m_rScalingLimitPages; + TQCheckBox * pApplyToAll; + TQCheckBox * pPrintGrid; + TQCheckBox * pPrintCommentIndicator; + TQCheckBox * pPrintFormulaIndicator; + TQCheckBox * pPrintObjects; + TQCheckBox * pPrintCharts; + TQCheckBox * pPrintGraphics; + TQLineEdit * ePrintRange; + TQLineEdit * eRepeatCols; + TQLineEdit * eRepeatRows; + TQLineEdit * m_focus; + TQComboBox * m_cZoom; + TQComboBox * m_cLimitPagesX; + TQComboBox * m_cLimitPagesY; + TQRadioButton * m_rScalingZoom; + TQRadioButton * m_rScalingLimitPages; }; } // namespace KSpread diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cc b/kspread/dialogs/kspread_dlg_pasteinsert.cc index 98a372963..83e8bce38 100644 --- a/kspread/dialogs/kspread_dlg_pasteinsert.cc +++ b/kspread/dialogs/kspread_dlg_pasteinsert.cc @@ -20,13 +20,13 @@ * Boston, MA 02110-1301, USA. */ -#include <qlayout.h> +#include <tqlayout.h> #include <klocale.h> #include <kbuttonbox.h> -#include <qbuttongroup.h> +#include <tqbuttongroup.h> #include <kdebug.h> -#include <qradiobutton.h> -#include <qcheckbox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> #include "kspread_dlg_pasteinsert.h" #include "kspread_canvas.h" @@ -37,25 +37,25 @@ using namespace KSpread; -PasteInsertDialog::PasteInsertDialog( View* parent, const char* name,const QRect &_rect) - : KDialogBase( parent, name, TRUE,i18n("Paste Inserting Cells"),Ok|Cancel ) +PasteInsertDialog::PasteInsertDialog( View* tqparent, const char* name,const TQRect &_rect) + : KDialogBase( tqparent, name, TRUE,i18n("Paste Inserting Cells"),Ok|Cancel ) { - m_pView = parent; + m_pView = tqparent; rect=_rect; - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QVBoxLayout *lay1 = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); - QButtonGroup *grp = new QButtonGroup( 1, QGroupBox::Horizontal, i18n("Insert"),page); + TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page); grp->setRadioButtonExclusive( TRUE ); - grp->layout(); + grp->tqlayout(); lay1->addWidget(grp); - rb1 = new QRadioButton( i18n("Move towards right"), grp ); - rb2 = new QRadioButton( i18n("Move towards bottom"), grp ); + rb1 = new TQRadioButton( i18n("Move towards right"), grp ); + rb2 = new TQRadioButton( i18n("Move towards bottom"), grp ); rb1->setChecked(true); - connect( this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) ); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); } void PasteInsertDialog::slotOk() diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.h b/kspread/dialogs/kspread_dlg_pasteinsert.h index 8914f90dd..7159b87ed 100644 --- a/kspread/dialogs/kspread_dlg_pasteinsert.h +++ b/kspread/dialogs/kspread_dlg_pasteinsert.h @@ -25,8 +25,8 @@ #include <kdialogbase.h> -class QCheckBox; -class QRadioButton; +class TQCheckBox; +class TQRadioButton; namespace KSpread { @@ -36,16 +36,17 @@ class View; class PasteInsertDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PasteInsertDialog( View* parent, const char* name, const QRect &_rect ); + PasteInsertDialog( View* tqparent, const char* name, const TQRect &_rect ); public slots: void slotOk(); private: View* m_pView; - QRadioButton *rb1; - QRadioButton *rb2; - QRect rect; + TQRadioButton *rb1; + TQRadioButton *rb2; + TQRect rect; }; } // namespace KSpread diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc index b6d0c2165..2b13cbdfc 100644 --- a/kspread/dialogs/kspread_dlg_preference.cc +++ b/kspread/dialogs/kspread_dlg_preference.cc @@ -25,12 +25,12 @@ * Boston, MA 02110-1301, USA. */ -#include <qvbox.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +#include <tqvbox.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> #include <kconfig.h> #include <kstatusbar.h> @@ -55,39 +55,39 @@ using namespace KSpread; -PreferenceDialog::PreferenceDialog( View* parent, const char* /*name*/) +PreferenceDialog::PreferenceDialog( View* tqparent, const char* /*name*/) : KDialogBase(KDialogBase::IconList,i18n("Configure KSpread") , KDialogBase::Ok | KDialogBase::Cancel| KDialogBase::Default, KDialogBase::Ok) { - m_pView=parent; + m_pView=tqparent; - connect(this, SIGNAL(okClicked()),this,SLOT(slotApply())); + connect(this, TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotApply())); - QVBox *page2=addVBoxPage(i18n("Locale Settings"), QString::null,BarIcon("gohome",KIcon::SizeMedium)); - _localePage=new parameterLocale(parent,page2 ); + TQVBox *page2=addVBoxPage(i18n("Locale Settings"), TQString(),BarIcon("gohome",KIcon::SizeMedium)); + _localePage=new parameterLocale(tqparent,page2 ); - QVBox *page3=addVBoxPage(i18n("Interface"), QString::null,BarIcon("signature", KIcon::SizeMedium) ); - _configure = new configure(parent,page3 ); + TQVBox *page3=addVBoxPage(i18n("Interface"), TQString(),BarIcon("signature", KIcon::SizeMedium) ); + _configure = new configure(tqparent,page3 ); - QVBox * page4=addVBoxPage(i18n("Misc"), QString::null,BarIcon("misc",KIcon::SizeMedium) ); - _miscParameter = new miscParameters(parent,page4 ); + TQVBox * page4=addVBoxPage(i18n("Misc"), TQString(),BarIcon("misc",KIcon::SizeMedium) ); + _miscParameter = new miscParameters(tqparent,page4 ); - QVBox *page5=addVBoxPage(i18n("Color"), QString::null,BarIcon("colorize",KIcon::SizeMedium) ); - _colorParameter=new colorParameters(parent,page5 ); + TQVBox *page5=addVBoxPage(i18n("Color"), TQString(),BarIcon("colorize",KIcon::SizeMedium) ); + _colorParameter=new colorParameters(tqparent,page5 ); - QVBox *page6=addVBoxPage(i18n("Page Layout"), QString::null,BarIcon("edit",KIcon::SizeMedium) ); - _layoutPage=new configureLayoutPage(parent,page6 ); + TQVBox *page6=addVBoxPage(i18n("Page Layout"), TQString(),BarIcon("edit",KIcon::SizeMedium) ); + _layoutPage=new configureLayoutPage(tqparent,page6 ); - QVBox *page7 = addVBoxPage( i18n("Spelling"), i18n("Spell Checker Behavior"), + TQVBox *page7 = addVBoxPage( i18n("Spelling"), i18n("Spell Checker Behavior"), BarIcon("spellcheck", KIcon::SizeMedium) ); - _spellPage=new configureSpellPage(parent,page7); + _spellPage=new configureSpellPage(tqparent,page7); if (KoSpeaker::isKttsdInstalled()) { - QVBox *page8 = addVBoxPage( i18n("Abbreviation for Text-to-Speech", "TTS"), + TQVBox *page8 = addVBoxPage( i18n("Abbreviation for Text-to-Speech", "TTS"), i18n("Text-to-Speech Settings"), BarIcon("access", KIcon::SizeMedium) ); - _ttsPage=new configureTTSPage(parent, page8); + _ttsPage=new configureTTSPage(tqparent, page8); } else _ttsPage = 0; } @@ -150,26 +150,26 @@ void PreferenceDialog::slotDefault() } -parameterLocale::parameterLocale( View* _view, QVBox *box , char *name ) - :QObject ( box->parent(),name) +parameterLocale::parameterLocale( View* _view, TQVBox *box , char *name ) + :TQObject ( box->tqparent(),name) { m_pView = _view; m_bUpdateLocale=false; - QGroupBox* tmpQGroupBox = new QVGroupBox( i18n("Settings"), box, "GroupBox" ); + TQGroupBox* tmpTQGroupBox = new TQVGroupBox( i18n("Settings"), box, "GroupBox" ); KLocale* locale=_view->doc()->locale(); - m_language=new QLabel( tmpQGroupBox,"label"); - m_number=new QLabel( tmpQGroupBox,"label6"); - m_date=new QLabel( tmpQGroupBox,"label1"); - m_shortDate=new QLabel( tmpQGroupBox,"label5"); - m_time=new QLabel( tmpQGroupBox,"label2"); - m_money=new QLabel( tmpQGroupBox,"label3"); + m_language=new TQLabel( tmpTQGroupBox,"label"); + m_number=new TQLabel( tmpTQGroupBox,"label6"); + m_date=new TQLabel( tmpTQGroupBox,"label1"); + m_shortDate=new TQLabel( tmpTQGroupBox,"label5"); + m_time=new TQLabel( tmpTQGroupBox,"label2"); + m_money=new TQLabel( tmpTQGroupBox,"label3"); updateToMatchLocale(locale); - m_updateButton=new QPushButton ( i18n("&Update Locale Settings"), tmpQGroupBox); - connect(m_updateButton, SIGNAL(clicked()),this,SLOT(updateDefaultSystemConfig())); + m_updateButton=new TQPushButton ( i18n("&Update Locale Settings"), tmpTQGroupBox); + connect(m_updateButton, TQT_SIGNAL(clicked()),this,TQT_SLOT(updateDefaultSystemConfig())); } void parameterLocale::apply() @@ -192,16 +192,16 @@ void parameterLocale::updateDefaultSystemConfig() void parameterLocale::updateToMatchLocale(KLocale* locale) { - m_language->setText( i18n("Language: %1").arg( locale->language() )); - m_number->setText( i18n("Default number format: %1").arg( locale->formatNumber(12.55) )); - m_date->setText( i18n("Long date format: %1").arg( locale->formatDate( QDate::currentDate() ))); - m_shortDate->setText( i18n("Short date format: %1").arg( locale->formatDate( QDate::currentDate() ,true) )); - m_time->setText( i18n("Time format: %1").arg( locale->formatTime( QTime::currentTime() ) )); - m_money->setText( i18n("Currency format: %1").arg( locale->formatMoney(12.55) )); + m_language->setText( i18n("Language: %1").tqarg( locale->language() )); + m_number->setText( i18n("Default number format: %1").tqarg( locale->formatNumber(12.55) )); + m_date->setText( i18n("Long date format: %1").tqarg( locale->formatDate( TQDate::tqcurrentDate() ))); + m_shortDate->setText( i18n("Short date format: %1").tqarg( locale->formatDate( TQDate::tqcurrentDate() ,true) )); + m_time->setText( i18n("Time format: %1").tqarg( locale->formatTime( TQTime::currentTime() ) )); + m_money->setText( i18n("Currency format: %1").tqarg( locale->formatMoney(12.55) )); } -configure::configure( View* _view, QVBox *box , char *name ) - :QObject ( box->parent(),name) +configure::configure( View* _view, TQVBox *box , char *name ) + :TQObject ( box->tqparent(),name) { m_pView = _view; @@ -214,7 +214,7 @@ configure::configure( View* _view, QVBox *box , char *name ) bool statusBar=true; m_oldBackupFile = true; - QGroupBox* tmpQGroupBox = new QVGroupBox( i18n("Settings"), box, "GroupBox" ); + TQGroupBox* tmpTQGroupBox = new TQVGroupBox( i18n("Settings"), box, "GroupBox" ); config = Factory::global()->config(); int _page=1; @@ -232,58 +232,58 @@ configure::configure( View* _view, QVBox *box , char *name ) rowHeader=config->readBoolEntry("Row Header",true); tabbar=config->readBoolEntry("Tabbar",true); formulaBar=config->readBoolEntry("Formula bar",true); - statusBar=config->readBoolEntry("Status bar",true); + statusBar=config->readBoolEntry("tqStatus bar",true); oldRecent=config->readNumEntry( "NbRecentFile" ,10); oldAutoSaveValue=config->readNumEntry("AutoSave",KoDocument::defaultAutoSave()/60); m_oldBackupFile=config->readBoolEntry("BackupFile",m_oldBackupFile); } - nbPage=new KIntNumInput(_page, tmpQGroupBox , 10); + nbPage=new KIntNumInput(_page, tmpTQGroupBox , 10); nbPage->setRange(1, 10, 1); nbPage->setLabel(i18n("Number of sheets open at the &beginning:")); - QWhatsThis::add(nbPage, i18n( "Controls how many worksheets will be created if the option Start with an empty document is chosen when KSpread is started." ) ); + TQWhatsThis::add(nbPage, i18n( "Controls how many worksheets will be created if the option Start with an empty document is chosen when KSpread is started." ) ); - nbRecentFile=new KIntNumInput(oldRecent, tmpQGroupBox , 10); + nbRecentFile=new KIntNumInput(oldRecent, tmpTQGroupBox , 10); nbRecentFile->setRange(1, 20, 1); nbRecentFile->setLabel(i18n("&Number of files to show in Recent Files list:")); - QWhatsThis::add(nbRecentFile, i18n( "Controls the maximum number of filenames that are shown when you select File-> Open Recent." ) ); + TQWhatsThis::add(nbRecentFile, i18n( "Controls the maximum number of filenames that are shown when you select File-> Open Recent." ) ); - autoSaveDelay=new KIntNumInput(oldAutoSaveValue, tmpQGroupBox , 10); + autoSaveDelay=new KIntNumInput(oldAutoSaveValue, tmpTQGroupBox , 10); autoSaveDelay->setRange(0, 60, 1); autoSaveDelay->setLabel(i18n("Au&tosave delay (minutes):")); autoSaveDelay->setSpecialValueText(i18n("Do not save automatically")); autoSaveDelay->setSuffix(i18n("min")); - QWhatsThis::add(autoSaveDelay, i18n( "Here you can select the time between autosaves, or disable this feature altogether by choosing Do not save automatically (drag the slider to the far left)." ) ); + TQWhatsThis::add(autoSaveDelay, i18n( "Here you can select the time between autosaves, or disable this feature altogether by choosing Do not save automatically (drag the slider to the far left)." ) ); - m_createBackupFile = new QCheckBox( i18n("Create backup files"), tmpQGroupBox ); + m_createBackupFile = new TQCheckBox( i18n("Create backup files"), tmpTQGroupBox ); m_createBackupFile->setChecked( m_oldBackupFile ); - QWhatsThis::add(m_createBackupFile, i18n( "Check this box if you want some backup files created. This is checked per default." ) ); + TQWhatsThis::add(m_createBackupFile, i18n( "Check this box if you want some backup files created. This is checked per default." ) ); - showVScrollBar=new QCheckBox(i18n("Show &vertical scrollbar"),tmpQGroupBox); + showVScrollBar=new TQCheckBox(i18n("Show &vertical scrollbar"),tmpTQGroupBox); showVScrollBar->setChecked(vertical); - QWhatsThis::add(showVScrollBar, i18n( "Check or uncheck this box to show or hide the vertical scrollbar in all sheets." ) ); + TQWhatsThis::add(showVScrollBar, i18n( "Check or uncheck this box to show or hide the vertical scrollbar in all sheets." ) ); - showHScrollBar=new QCheckBox(i18n("Show &horizontal scrollbar"),tmpQGroupBox); + showHScrollBar=new TQCheckBox(i18n("Show &horizontal scrollbar"),tmpTQGroupBox); showHScrollBar->setChecked(horizontal); - QWhatsThis::add(showHScrollBar, i18n( "Check or uncheck this box to show or hide the horizontal scrollbar in all sheets." ) ); + TQWhatsThis::add(showHScrollBar, i18n( "Check or uncheck this box to show or hide the horizontal scrollbar in all sheets." ) ); - showColHeader=new QCheckBox(i18n("Show c&olumn header"),tmpQGroupBox); + showColHeader=new TQCheckBox(i18n("Show c&olumn header"),tmpTQGroupBox); showColHeader->setChecked(colHeader); - QWhatsThis::add(showColHeader, i18n( "Check this box to show the column letters across the top of each worksheet." ) ); - showRowHeader=new QCheckBox(i18n("Show &row header"),tmpQGroupBox); + TQWhatsThis::add(showColHeader, i18n( "Check this box to show the column letters across the top of each worksheet." ) ); + showRowHeader=new TQCheckBox(i18n("Show &row header"),tmpTQGroupBox); showRowHeader->setChecked(rowHeader); - QWhatsThis::add(showRowHeader, i18n( "Check this box to show the row numbers down the left side." ) ); + TQWhatsThis::add(showRowHeader, i18n( "Check this box to show the row numbers down the left side." ) ); - showTabBar =new QCheckBox(i18n("Show ta&bs"),tmpQGroupBox); + showTabBar =new TQCheckBox(i18n("Show ta&bs"),tmpTQGroupBox); showTabBar->setChecked(tabbar); - QWhatsThis::add(showTabBar, i18n( "This check box controls whether the sheet tabs are shown at the bottom of the worksheet." ) ); + TQWhatsThis::add(showTabBar, i18n( "This check box controls whether the sheet tabs are shown at the bottom of the worksheet." ) ); - showFormulaBar =new QCheckBox(i18n("Sho&w formula toolbar"),tmpQGroupBox); + showFormulaBar =new TQCheckBox(i18n("Sho&w formula toolbar"),tmpTQGroupBox); showFormulaBar->setChecked(formulaBar); - QWhatsThis::add(showFormulaBar, i18n( "Here is where you can choose to show or hide the Formula bar." ) ); + TQWhatsThis::add(showFormulaBar, i18n( "Here is where you can choose to show or hide the Formula bar." ) ); - showStatusBar =new QCheckBox(i18n("Show stat&us bar"),tmpQGroupBox); + showStatusBar =new TQCheckBox(i18n("Show stat&us bar"),tmpTQGroupBox); showStatusBar->setChecked(statusBar); - QWhatsThis::add(showStatusBar, i18n( "Uncheck this box if you want to hide the status bar." ) ); + TQWhatsThis::add(showStatusBar, i18n( "Uncheck this box if you want to hide the status bar." ) ); } @@ -377,7 +377,7 @@ void configure::apply() } active=showStatusBar->isChecked(); - config->writeEntry( "Status bar",active); + config->writeEntry( "tqStatus bar",active); m_pView->showStatusBar( active ); int val=nbRecentFile->value(); @@ -405,13 +405,13 @@ void configure::apply() } -miscParameters::miscParameters( View* _view,QVBox *box, char *name ) - :QObject ( box->parent(),name) +miscParameters::miscParameters( View* _view,TQVBox *box, char *name ) + :TQObject ( box->tqparent(),name) { m_pView = _view; - QGroupBox* tmpQGroupBox = new QVGroupBox( i18n("Misc"), box, "GroupBox" ); + TQGroupBox* tmpTQGroupBox = new TQVGroupBox( i18n("Misc"), box, "GroupBox" ); config = Factory::global()->config(); indentUnit = _view->doc()->unit(); @@ -430,17 +430,17 @@ miscParameters::miscParameters( View* _view,QVBox *box, char *name ) m_oldNbRedo=config->readNumEntry("UndoRedo",m_oldNbRedo); } - m_undoRedoLimit=new KIntNumInput( m_oldNbRedo, tmpQGroupBox ); + m_undoRedoLimit=new KIntNumInput( m_oldNbRedo, tmpTQGroupBox ); m_undoRedoLimit->setLabel(i18n("Undo/redo limit:")); m_undoRedoLimit->setRange(10, 60, 1); - QLabel *label=new QLabel(i18n("&Completion mode:"), tmpQGroupBox); + TQLabel *label=new TQLabel(i18n("&Completion mode:"), tmpTQGroupBox); - typeCompletion=new QComboBox(tmpQGroupBox); + typeCompletion=new TQComboBox(tmpTQGroupBox); label->setBuddy(typeCompletion); - QWhatsThis::add(typeCompletion, i18n( "Lets you choose the (auto) text completion mode from a range of options in the drop down selection box." ) ); - QStringList listType; + TQWhatsThis::add(typeCompletion, i18n( "Lets you choose the (auto) text completion mode from a range of options in the drop down selection box." ) ); + TQStringList listType; listType+=i18n("None"); listType+=i18n("Manual"); listType+=i18n("Popup"); @@ -449,10 +449,10 @@ miscParameters::miscParameters( View* _view,QVBox *box, char *name ) typeCompletion->insertStringList(listType); typeCompletion->setCurrentItem(0); comboChanged=false; - connect(typeCompletion,SIGNAL(activated( const QString & )),this,SLOT(slotTextComboChanged(const QString &))); + connect(typeCompletion,TQT_SIGNAL(activated( const TQString & )),this,TQT_SLOT(slotTextComboChanged(const TQString &))); - label=new QLabel(i18n("&Pressing enter moves cell cursor:"), tmpQGroupBox); - typeOfMove=new QComboBox( tmpQGroupBox); + label=new TQLabel(i18n("&Pressing enter moves cell cursor:"), tmpTQGroupBox); + typeOfMove=new TQComboBox( tmpTQGroupBox); label->setBuddy(typeOfMove); listType.clear(); listType+=i18n("Down"); @@ -462,13 +462,13 @@ miscParameters::miscParameters( View* _view,QVBox *box, char *name ) listType+=i18n("Down, First Column"); typeOfMove->insertStringList(listType); typeOfMove->setCurrentItem(0); - QWhatsThis::add(typeOfMove, i18n( "When you have selected a cell, pressing the Enter key will move the cell cursor one cell left, right, up or down, as determined by this setting." ) ); + TQWhatsThis::add(typeOfMove, i18n( "When you have selected a cell, pressing the Enter key will move the cell cursor one cell left, right, up or down, as determined by this setting." ) ); - label=new QLabel(i18n("&Method of calc:"), tmpQGroupBox); + label=new TQLabel(i18n("&Method of calc:"), tmpTQGroupBox); - typeCalc=new QComboBox( tmpQGroupBox); + typeCalc=new TQComboBox( tmpTQGroupBox); label->setBuddy(typeCalc); - QStringList listTypeCalc; + TQStringList listTypeCalc; listTypeCalc+=i18n("Sum"); listTypeCalc+=i18n("Min"); listTypeCalc+=i18n("Max"); @@ -478,26 +478,26 @@ miscParameters::miscParameters( View* _view,QVBox *box, char *name ) listTypeCalc+=i18n("None"); typeCalc->insertStringList(listTypeCalc); typeCalc->setCurrentItem(0); - QWhatsThis::add(typeCalc, i18n( "This drop down selection box can be used to choose the calculation performed by the Statusbar Summary function." ) ); + TQWhatsThis::add(typeCalc, i18n( "This drop down selection box can be used to choose the calculation performed by the Statusbar Summary function." ) ); -// valIndent = new KDoubleNumInput( _indent, tmpQGroupBox , 10.0 ); - valIndent = new KDoubleNumInput( tmpQGroupBox ); +// valIndent = new KDoubleNumInput( _indent, tmpTQGroupBox , 10.0 ); + valIndent = new KDoubleNumInput( tmpTQGroupBox ); valIndent->setRange( KoUnit::toUserValue( 0.0, indentUnit ), KoUnit::toUserValue( 400.0, indentUnit ), KoUnit::toUserValue( 10.0, indentUnit) ); // valIndent->setRange( 0.0, 100.0, 10.0 ); valIndent->setValue ( KoUnit::toUserValue( _indent, indentUnit ) ); - QWhatsThis::add(valIndent, i18n( "Lets you define the amount of indenting used by the Increase Indent and Decrease Indent option in the Format menu." ) ); - valIndent->setLabel(i18n("&Indentation step (%1):").arg(KoUnit::unitName(indentUnit))); + TQWhatsThis::add(valIndent, i18n( "Lets you define the amount of indenting used by the Increase Indent and Decrease Indent option in the Format menu." ) ); + valIndent->setLabel(i18n("&Indentation step (%1):").tqarg(KoUnit::unitName(indentUnit))); - msgError= new QCheckBox(i18n("&Show error message for invalid formulae"),tmpQGroupBox); + msgError= new TQCheckBox(i18n("&Show error message for invalid formulae"),tmpTQGroupBox); msgError->setChecked(m_bMsgError); - QWhatsThis::add(msgError, i18n( "If this box is checked a message box will pop up when what you have entered into a cell cannot be understood by KSpread." ) ); + TQWhatsThis::add(msgError, i18n( "If this box is checked a message box will pop up when what you have entered into a cell cannot be understood by KSpread." ) ); initComboBox(); } -void miscParameters::slotTextComboChanged(const QString &) +void miscParameters::slotTextComboChanged(const TQString &) { comboChanged=true; } @@ -534,19 +534,19 @@ switch(tmpCompletion ) } switch( m_pView->doc()->getMoveToValue( )) { - case Bottom: + case KSpread::Bottom: typeOfMove->setCurrentItem(0); break; - case Left: + case KSpread::Left: typeOfMove->setCurrentItem(3); break; - case Top: + case KSpread::Top: typeOfMove->setCurrentItem(1); break; - case Right: + case KSpread::Right: typeOfMove->setCurrentItem(2); break; - case BottomFirst: + case KSpread::BottomFirst: typeOfMove->setCurrentItem(4); break; default : @@ -637,23 +637,23 @@ void miscParameters::apply() config->writeEntry( "Completion Mode", (int)tmpCompletion); } - KSpread::MoveTo tmpMoveTo=Bottom; + KSpread::MoveTo tmpMoveTo=KSpread::Bottom; switch(typeOfMove->currentItem()) { case 0: - tmpMoveTo=Bottom; + tmpMoveTo=KSpread::Bottom; break; case 1: - tmpMoveTo=Top; + tmpMoveTo=KSpread::Top; break; case 2: - tmpMoveTo=Right; + tmpMoveTo=KSpread::Right; break; case 3: - tmpMoveTo=Left; + tmpMoveTo=KSpread::Left; break; case 4: - tmpMoveTo=BottomFirst; + tmpMoveTo=KSpread::BottomFirst; break; } if(tmpMoveTo!=m_pView->doc()->getMoveToValue()) @@ -716,13 +716,13 @@ void miscParameters::apply() -colorParameters::colorParameters( View* _view,QVBox *box , char *name ) - :QObject ( box->parent(),name) +colorParameters::colorParameters( View* _view,TQVBox *box , char *name ) + :TQObject ( box->tqparent(),name) { m_pView = _view; config = Factory::global()->config(); - QColor _gridColor(Qt::lightGray); + TQColor _gridColor(TQt::lightGray); if ( config->hasGroup("KSpread Color" ) ) { @@ -730,36 +730,36 @@ colorParameters::colorParameters( View* _view,QVBox *box , char *name ) _gridColor = config->readColorEntry("GridColor",&_gridColor); } - QGroupBox* tmpQGroupBox = new QVGroupBox( i18n("Color"), box, "GroupBox" ); + TQGroupBox* tmpTQGroupBox = new TQVGroupBox( i18n("Color"), box, "GroupBox" ); - QLabel *label = new QLabel(i18n("&Grid color:"), tmpQGroupBox,"label20" ); + TQLabel *label = new TQLabel(i18n("&Grid color:"), tmpTQGroupBox,"label20" ); gridColor = new KColorButton( _gridColor, - Qt::lightGray, - tmpQGroupBox ); - QWhatsThis::add(gridColor, i18n( "Click here to change the grid color ie the color of the borders of each cell." ) ); + TQt::lightGray, + tmpTQGroupBox ); + TQWhatsThis::add(gridColor, i18n( "Click here to change the grid color ie the color of the borders of each cell." ) ); label->setBuddy(gridColor); - QColor _pbColor(Qt::red); + TQColor _pbColor(TQt::red); if ( config->hasGroup("KSpread Color" ) ) { config->setGroup( "KSpread Color" ); _pbColor = config->readColorEntry("PageBorderColor", &_pbColor); } - QLabel * label2 = new QLabel( i18n("&Page borders:"), tmpQGroupBox, "label21" ); + TQLabel * label2 = new TQLabel( i18n("&Page borders:"), tmpTQGroupBox, "label21" ); pageBorderColor = new KColorButton( _pbColor, - Qt::red, - tmpQGroupBox ); - QWhatsThis::add(pageBorderColor, i18n( "When the View ->Show Page Borders menu item is checked, the page borders are displayed. Click here to choose another color for the borders than the default red." ) ); + TQt::red, + tmpTQGroupBox ); + TQWhatsThis::add(pageBorderColor, i18n( "When the View ->Show Page Borders menu item is checked, the page borders are displayed. Click here to choose another color for the borders than the default red." ) ); label2->setBuddy(pageBorderColor); } void colorParameters::apply() { - QColor _col = gridColor->color(); + TQColor _col = gridColor->color(); if ( m_pView->doc()->gridColor() != _col ) { m_pView->doc()->setGridColor( _col ); @@ -767,7 +767,7 @@ void colorParameters::apply() config->writeEntry( "GridColor", _col ); } - QColor _pbColor = pageBorderColor->color(); + TQColor _pbColor = pageBorderColor->color(); if ( m_pView->doc()->pageBorderColor() != _pbColor ) { m_pView->doc()->changePageBorderColor( _pbColor ); @@ -784,55 +784,55 @@ void colorParameters::slotDefault() -configureLayoutPage::configureLayoutPage( View* _view,QVBox *box , char *name ) - :QObject ( box->parent(),name) +configureLayoutPage::configureLayoutPage( View* _view,TQVBox *box , char *name ) + :TQObject ( box->tqparent(),name) { m_pView = _view; - QGroupBox* tmpQGroupBox = new QGroupBox( 0, Qt::Vertical, i18n("Default Parameters"), box, "GroupBox" ); - tmpQGroupBox->layout()->setSpacing(KDialog::spacingHint()); - tmpQGroupBox->layout()->setMargin(KDialog::marginHint()); + TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Default Parameters"), box, "GroupBox" ); + tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint()); + tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint()); - QGridLayout *grid1 = new QGridLayout(tmpQGroupBox->layout(),8,1); + TQGridLayout *grid1 = new TQGridLayout(tmpTQGroupBox->tqlayout(),8,1); grid1->addRowSpacing( 0, KDialog::marginHint() ); grid1->setRowStretch( 7, 10 ); config = Factory::global()->config(); - QLabel *label=new QLabel(i18n("Default page &size:"), tmpQGroupBox); + TQLabel *label=new TQLabel(i18n("Default page &size:"), tmpTQGroupBox); grid1->addWidget(label,0,0); - defaultSizePage=new QComboBox( tmpQGroupBox); + defaultSizePage=new TQComboBox( tmpTQGroupBox); label->setBuddy(defaultSizePage); defaultSizePage->insertStringList( KoPageFormat::allFormats() ); defaultSizePage->setCurrentItem(1); - QWhatsThis::add(defaultSizePage, i18n( "Choose the default page size for your worksheet among all the most common page sizes.\nNote that you can overwrite the page size for the current sheet using the Format -> Page Layout... dialog." ) ); + TQWhatsThis::add(defaultSizePage, i18n( "Choose the default page size for your worksheet among all the most common page sizes.\nNote that you can overwrite the page size for the current sheet using the Format -> Page Layout... dialog." ) ); grid1->addWidget(defaultSizePage,1,0); - label=new QLabel(i18n("Default page &orientation:"), tmpQGroupBox); + label=new TQLabel(i18n("Default page &orientation:"), tmpTQGroupBox); grid1->addWidget(label,2,0); - defaultOrientationPage=new QComboBox( tmpQGroupBox); + defaultOrientationPage=new TQComboBox( tmpTQGroupBox); label->setBuddy(defaultOrientationPage); - QStringList listType; + TQStringList listType; listType+=i18n( "Portrait" ); listType+=i18n( "Landscape" ); defaultOrientationPage->insertStringList(listType); defaultOrientationPage->setCurrentItem(0); - QWhatsThis::add(defaultOrientationPage, i18n( "Choose the sheet orientation: portrait or lanscape.\nNote that you can overwrite the orientation for the current sheet using the Format -> Page Layout... dialog." ) ); + TQWhatsThis::add(defaultOrientationPage, i18n( "Choose the sheet orientation: portrait or lanscape.\nNote that you can overwrite the orientation for the current sheet using the Format -> Page Layout... dialog." ) ); grid1->addWidget(defaultOrientationPage,3,0); - label=new QLabel(tmpQGroupBox); + label=new TQLabel(tmpTQGroupBox); label->setText(i18n("Default page &unit:")); grid1->addWidget(label,4,0); - defaultUnit=new QComboBox( tmpQGroupBox); + defaultUnit=new TQComboBox( tmpTQGroupBox); label->setBuddy(defaultUnit); defaultUnit->insertStringList(KoUnit::listOfUnitName()); defaultUnit->setCurrentItem(0); - QWhatsThis::add(defaultUnit, i18n( "Choose the default unit that will be used in your sheet.\nNote that you can overwrite the unit for the current sheet using the Format -> Page Layout... dialog." ) ); + TQWhatsThis::add(defaultUnit, i18n( "Choose the default unit that will be used in your sheet.\nNote that you can overwrite the unit for the current sheet using the Format -> Page Layout... dialog." ) ); grid1->addWidget(defaultUnit,5,0); initCombo(); @@ -890,8 +890,8 @@ void configureLayoutPage::apply() m_pView->slotUpdateView( m_pView->activeSheet() ); } -configureSpellPage::configureSpellPage( View* _view,QVBox *box , char *name ) - :QObject ( box->parent(),name) +configureSpellPage::configureSpellPage( View* _view,TQVBox *box , char *name ) + :TQObject ( box->tqparent(),name) { m_pView = _view; @@ -899,13 +899,13 @@ configureSpellPage::configureSpellPage( View* _view,QVBox *box , char *name ) m_spellConfigWidget = new KSpellConfig( box, "spell_check",m_pView->doc()->getKSpellConfig()/*, false*/); - dontCheckUpperWord = new QCheckBox( i18n("Skip all uppercase words"),box); - QWhatsThis::add(dontCheckUpperWord, i18n( "If checked, the words written in uppercase letters are not spell checked. This might be useful if you have a lot of acronyms such as KDE for example." ) ); - dontCheckTitleCase = new QCheckBox( i18n("Do not check title case"),box); - QWhatsThis::add(dontCheckTitleCase, i18n( "Check this box if you want the spellchecker to ignore the title case, for example My Own Spreadsheet or My own spreadsheet. If this is unchecked, the spell checker will ask for a uppercase letter in the title nouns." ) ); + dontCheckUpperWord = new TQCheckBox( i18n("Skip all uppercase words"),box); + TQWhatsThis::add(dontCheckUpperWord, i18n( "If checked, the words written in uppercase letters are not spell checked. This might be useful if you have a lot of acronyms such as KDE for example." ) ); + dontCheckTitleCase = new TQCheckBox( i18n("Do not check title case"),box); + TQWhatsThis::add(dontCheckTitleCase, i18n( "Check this box if you want the spellchecker to ignore the title case, for example My Own Spreadsheet or My own spreadsheet. If this is unchecked, the spell checker will ask for a uppercase letter in the title nouns." ) ); - QWidget* spacer = new QWidget( box ); - spacer->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) ); + TQWidget* spacer = new TQWidget( box ); + spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); if( config->hasGroup("KSpell kspread") ) { @@ -955,33 +955,33 @@ void configureSpellPage::slotDefault() //// -configureTTSPage::configureTTSPage( View *_view, QVBox *box, char *name ) - : QObject( box->parent(), name ) +configureTTSPage::configureTTSPage( View *_view, TQVBox *box, char *name ) + : TQObject( box->tqparent(), name ) { Q_UNUSED(_view); - m_cbSpeakPointerWidget = new QCheckBox(i18n("Speak widget under &mouse pointer"), box); - m_cbSpeakFocusWidget = new QCheckBox(i18n("Speak widget with &focus"), box); - m_gbScreenReaderOptions = new QVGroupBox("", box); + m_cbSpeakPointerWidget = new TQCheckBox(i18n("Speak widget under &mouse pointer"), box); + m_cbSpeakFocusWidget = new TQCheckBox(i18n("Speak widget with &focus"), box); + m_gbScreenReaderOptions = new TQVGroupBox("", box); m_gbScreenReaderOptions->setMargin( KDialog::marginHint() ); m_gbScreenReaderOptions->setInsideSpacing( KDialog::spacingHint() ); - m_cbSpeakTooltips = new QCheckBox(i18n("Speak &tool tips"), m_gbScreenReaderOptions); - m_cbSpeakWhatsThis = new QCheckBox(i18n("Speak &What's This"), m_gbScreenReaderOptions); - m_cbSpeakDisabled = new QCheckBox(i18n("Verbal indication if widget is disabled (grayed)", + m_cbSpeakTooltips = new TQCheckBox(i18n("Speak &tool tips"), m_gbScreenReaderOptions); + m_cbSpeakWhatsThis = new TQCheckBox(i18n("Speak &What's This"), m_gbScreenReaderOptions); + m_cbSpeakDisabled = new TQCheckBox(i18n("Verbal indication if widget is disabled (grayed)", "&Say whether disabled"), m_gbScreenReaderOptions); - m_cbSpeakAccelerators = new QCheckBox(i18n("Spea&k accelerators"), m_gbScreenReaderOptions); - QHBox* hbAcceleratorPrefix = new QHBox(m_gbScreenReaderOptions); - QWidget* spacer = new QWidget(hbAcceleratorPrefix); + m_cbSpeakAccelerators = new TQCheckBox(i18n("Spea&k accelerators"), m_gbScreenReaderOptions); + TQHBox* hbAcceleratorPrefix = new TQHBox(m_gbScreenReaderOptions); + TQWidget* spacer = new TQWidget(hbAcceleratorPrefix); spacer->setMinimumWidth(2 * KDialog::marginHint()); m_lblAcceleratorPrefix = - new QLabel(i18n("A word spoken before another word", "Pr&efaced by the word:"), + new TQLabel(i18n("A word spoken before another word", "Pr&efaced by the word:"), hbAcceleratorPrefix); - m_leAcceleratorPrefixWord = new QLineEdit(i18n("Keyboard accelerator, such as Alt+F", "Accelerator"), + m_leAcceleratorPrefixWord = new TQLineEdit(i18n("Keyboard accelerator, such as Alt+F", "Accelerator"), hbAcceleratorPrefix); m_lblAcceleratorPrefix->setBuddy(m_leAcceleratorPrefixWord); - QHBox* hbPollingInterval = new QHBox(m_gbScreenReaderOptions); + TQHBox* hbPollingInterval = new TQHBox(m_gbScreenReaderOptions); hbPollingInterval->setMargin( 0 ); - QLabel* lblPollingInterval = new QLabel(i18n("&Polling interval:"), hbPollingInterval); + TQLabel* lblPollingInterval = new TQLabel(i18n("&Polling interval:"), hbPollingInterval); m_iniPollingInterval = new KIntNumInput(hbPollingInterval); m_iniPollingInterval->setSuffix(" ms"); m_iniPollingInterval->setRange(100, 5000, 100, true); @@ -1000,9 +1000,9 @@ configureTTSPage::configureTTSPage( View *_view, QVBox *box, char *name ) m_iniPollingInterval->setValue(config->readNumEntry("PollingInterval", 600)); screenReaderOptionChanged(); - connect(m_cbSpeakPointerWidget, SIGNAL(toggled(bool)), this, SLOT(screenReaderOptionChanged())); - connect(m_cbSpeakFocusWidget, SIGNAL(toggled(bool)), this, SLOT(screenReaderOptionChanged())); - connect(m_cbSpeakAccelerators, SIGNAL(toggled(bool)), this, SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakPointerWidget, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakFocusWidget, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakAccelerators, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); } void configureTTSPage::slotDefault() diff --git a/kspread/dialogs/kspread_dlg_preference.h b/kspread/dialogs/kspread_dlg_preference.h index d23739b81..ec4abf11d 100644 --- a/kspread/dialogs/kspread_dlg_preference.h +++ b/kspread/dialogs/kspread_dlg_preference.h @@ -33,10 +33,10 @@ class KConfig; class KIntNumInput; class KDoubleNumInput; class KSpellConfig; -class QCheckBox; -class QComboBox; -class QVGroupBox; -class QPushButton; +class TQCheckBox; +class TQComboBox; +class TQVGroupBox; +class TQPushButton; class KColorButton; namespace KSpread @@ -44,11 +44,12 @@ namespace KSpread class Sheet; class View; -class parameterLocale : public QObject +class parameterLocale : public TQObject { Q_OBJECT + TQ_OBJECT public: - parameterLocale( View* _view,QVBox *box, char *name = 0); + parameterLocale( View* _view,TQVBox *box, char *name = 0); void apply(); public slots: void updateDefaultSystemConfig(); @@ -58,17 +59,18 @@ public slots: */ void updateToMatchLocale(KLocale* locale); - QLabel *m_shortDate,*m_time,*m_money,*m_date,*m_language,*m_number; - QPushButton *m_updateButton; + TQLabel *m_shortDate,*m_time,*m_money,*m_date,*m_language,*m_number; + TQPushButton *m_updateButton; View* m_pView; bool m_bUpdateLocale; }; -class configure : public QObject +class configure : public TQObject { Q_OBJECT + TQ_OBJECT public: - configure( View* _view,QVBox *box, char *name = 0 ); + configure( View* _view,TQVBox *box, char *name = 0 ); void apply(); void slotDefault(); protected: @@ -76,14 +78,14 @@ protected: KIntNumInput *nbPage; KIntNumInput* nbRecentFile; KIntNumInput* autoSaveDelay; - QCheckBox *showVScrollBar; - QCheckBox *showHScrollBar; - QCheckBox *showColHeader; - QCheckBox *showRowHeader; - QCheckBox *showTabBar; - QCheckBox *showFormulaBar; - QCheckBox *showStatusBar; - QCheckBox *m_createBackupFile; + TQCheckBox *showVScrollBar; + TQCheckBox *showHScrollBar; + TQCheckBox *showColHeader; + TQCheckBox *showRowHeader; + TQCheckBox *showTabBar; + TQCheckBox *showFormulaBar; + TQCheckBox *showStatusBar; + TQCheckBox *m_createBackupFile; bool m_oldBackupFile; KConfig* config; @@ -92,18 +94,19 @@ protected: } ; -class miscParameters : public QObject +class miscParameters : public TQObject { Q_OBJECT + TQ_OBJECT public: - miscParameters( View* _view, QVBox *box, char *name = 0 ); + miscParameters( View* _view, TQVBox *box, char *name = 0 ); void apply(); void slotDefault(); void initComboBox(); public slots: - void slotTextComboChanged(const QString &); + void slotTextComboChanged(const TQString &); protected: View* m_pView; @@ -114,20 +117,21 @@ protected: */ KoUnit::Unit indentUnit; KConfig* config; - QComboBox *typeCompletion; - QComboBox *typeCalc; - QComboBox *typeOfMove; - QCheckBox *msgError; + TQComboBox *typeCompletion; + TQComboBox *typeCalc; + TQComboBox *typeOfMove; + TQCheckBox *msgError; KIntNumInput* m_undoRedoLimit; bool comboChanged; int m_oldNbRedo; } ; -class colorParameters : public QObject +class colorParameters : public TQObject { Q_OBJECT + TQ_OBJECT public: - colorParameters( View* _view, QVBox *box, char *name = 0 ); + colorParameters( View* _view, TQVBox *box, char *name = 0 ); void apply(); void slotDefault(); protected: @@ -137,19 +141,20 @@ protected: KConfig* config; } ; -class configureLayoutPage : public QObject +class configureLayoutPage : public TQObject { Q_OBJECT + TQ_OBJECT public: - configureLayoutPage( View* _view,QVBox *box, char *name = 0 ); + configureLayoutPage( View* _view,TQVBox *box, char *name = 0 ); void apply(); void slotDefault(); void initCombo(); protected: View* m_pView; - QComboBox *defaultOrientationPage; - QComboBox *defaultSizePage; - QComboBox *defaultUnit; + TQComboBox *defaultOrientationPage; + TQComboBox *defaultSizePage; + TQComboBox *defaultUnit; //store old config int paper; int orientation; @@ -158,51 +163,54 @@ protected: KConfig* config; } ; -class configureSpellPage : public QObject +class configureSpellPage : public TQObject { Q_OBJECT + TQ_OBJECT public: - configureSpellPage( View* _view, QVBox *box, char *name = 0 ); + configureSpellPage( View* _view, TQVBox *box, char *name = 0 ); void apply(); void slotDefault(); protected: View * m_pView; KConfig * config; KSpellConfig *m_spellConfigWidget; - QCheckBox *dontCheckUpperWord; - QCheckBox *dontCheckTitleCase; + TQCheckBox *dontCheckUpperWord; + TQCheckBox *dontCheckTitleCase; } ; -class configureTTSPage : public QObject +class configureTTSPage : public TQObject { Q_OBJECT + TQ_OBJECT public: - configureTTSPage( View *_view, QVBox *box, char *name = 0 ); + configureTTSPage( View *_view, TQVBox *box, char *name = 0 ); void slotDefault(); void apply(); private slots: void screenReaderOptionChanged(); private: KConfig* config; - QCheckBox* m_cbSpeakPointerWidget; - QCheckBox* m_cbSpeakFocusWidget; - QVGroupBox* m_gbScreenReaderOptions; - QCheckBox* m_cbSpeakTooltips; - QCheckBox* m_cbSpeakWhatsThis; - QCheckBox* m_cbSpeakDisabled; - QCheckBox* m_cbSpeakAccelerators; - QLabel* m_lblAcceleratorPrefix; - QLineEdit* m_leAcceleratorPrefixWord; + TQCheckBox* m_cbSpeakPointerWidget; + TQCheckBox* m_cbSpeakFocusWidget; + TQVGroupBox* m_gbScreenReaderOptions; + TQCheckBox* m_cbSpeakTooltips; + TQCheckBox* m_cbSpeakWhatsThis; + TQCheckBox* m_cbSpeakDisabled; + TQCheckBox* m_cbSpeakAccelerators; + TQLabel* m_lblAcceleratorPrefix; + TQLineEdit* m_leAcceleratorPrefixWord; KIntNumInput* m_iniPollingInterval; }; class PreferenceDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum { KS_PREFERENCES = 1, KS_LOCALE = 2, KS_INTERFACE = 4, KS_MISC = 8, KS_COLOR = 16, KS_LAYOUT = 32, KS_SPELLING = 64 }; - PreferenceDialog( View* parent, const char* name); + PreferenceDialog( View* tqparent, const char* name); public slots: void slotApply(); void slotDefault(); diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc index 5c7faf2bd..1fbb55e32 100644 --- a/kspread/dialogs/kspread_dlg_reference.cc +++ b/kspread/dialogs/kspread_dlg_reference.cc @@ -35,12 +35,12 @@ #include "selection.h" #include "kspread_locale.h" -#include <qvariant.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qlayout.h> +#include <tqvariant.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqlayout.h> #include <kbuttonbox.h> #include <kmessagebox.h> @@ -51,22 +51,22 @@ using namespace KSpread; -reference::reference( View* parent, const char* name ) - : QDialog( parent, name,TRUE ) +reference::reference( View* tqparent, const char* name ) + : TQDialog( tqparent, name,TRUE ) { - m_pView = parent; - QVBoxLayout *lay1 = new QVBoxLayout( this ); + m_pView = tqparent; + TQVBoxLayout *lay1 = new TQVBoxLayout( this ); lay1->setMargin( KDialog::marginHint() ); lay1->setSpacing( KDialog::spacingHint() ); - m_list = new QListBox(this); + m_list = new TQListBox(this); lay1->addWidget( m_list ); setCaption( i18n("Area Name") ); - m_rangeName = new QLabel(this); + m_rangeName = new TQLabel(this); lay1->addWidget(m_rangeName); - m_pRemove = new QPushButton(i18n("&Remove"), this); + m_pRemove = new TQPushButton(i18n("&Remove"), this); lay1->addWidget( m_pRemove ); //m_pRemove->setEnabled(false); KButtonBox *bb = new KButtonBox( this ); @@ -75,23 +75,23 @@ reference::reference( View* parent, const char* name ) m_pOk = bb->addButton( KStdGuiItem::ok() ); m_pCancel = bb->addButton( KStdGuiItem::cancel() ); m_pOk->setDefault( TRUE ); - bb->layout(); + bb->tqlayout(); lay1->addWidget( bb ); - QString text; - QStringList sheetName; - QPtrListIterator<Sheet> it2 ( m_pView->doc()->map()->sheetList() ); + TQString text; + TQStringList sheetName; + TQPtrListIterator<Sheet> it2 ( m_pView->doc()->map()->sheetList() ); for( ; it2.current(); ++it2 ) { sheetName.append( it2.current()->sheetName()); } - QValueList<Reference>::Iterator it; - QValueList<Reference> area = m_pView->doc()->listArea(); + TQValueList<Reference>::Iterator it; + TQValueList<Reference> area = m_pView->doc()->listArea(); for ( it = area.begin(); it != area.end(); ++it ) { text = (*it).ref_name; - if ( sheetName.contains((*it).sheet_name )) + if ( sheetName.tqcontains((*it).sheet_name )) m_list->insertItem(text); } @@ -102,24 +102,24 @@ reference::reference( View* parent, const char* name ) m_pEdit->setEnabled( false ); } - connect( m_pOk, SIGNAL( clicked() ), this, SLOT( slotOk() ) ); - connect( m_pCancel, SIGNAL( clicked() ), this, SLOT( slotCancel() ) ); - connect( m_pEdit, SIGNAL( clicked() ), this, SLOT( slotEdit() ) ); - connect( m_pRemove, SIGNAL( clicked() ), this, SLOT( slotRemove() ) ); - connect( m_list, SIGNAL(doubleClicked(QListBoxItem *)), this, - SLOT(slotDoubleClicked(QListBoxItem *))); - connect( m_list, SIGNAL(highlighted ( QListBoxItem * ) ), this, - SLOT(slotHighlighted(QListBoxItem * ))); - m_rangeName->setText(i18n("Area: %1").arg("")); + connect( m_pOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOk() ) ); + connect( m_pCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( m_pEdit, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEdit() ) ); + connect( m_pRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemove() ) ); + connect( m_list, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), this, + TQT_SLOT(slotDoubleClicked(TQListBoxItem *))); + connect( m_list, TQT_SIGNAL(highlighted ( TQListBoxItem * ) ), this, + TQT_SLOT(slotHighlighted(TQListBoxItem * ))); + m_rangeName->setText(i18n("Area: %1").tqarg("")); resize( 250, 200 ); } -void reference::displayAreaValues(QString const & areaName) +void reference::displayAreaValues(TQString const & areaName) { - QString tmpName; - QValueList<Reference>::Iterator it; - QValueList<Reference> area( m_pView->doc()->listArea() ); + TQString tmpName; + TQValueList<Reference>::Iterator it; + TQValueList<Reference> area( m_pView->doc()->listArea() ); for ( it = area.begin(); it != area.end(); ++it ) { if ((*it).ref_name == areaName) @@ -134,17 +134,17 @@ void reference::displayAreaValues(QString const & areaName) } } - tmpName = i18n("Area: %1").arg(tmpName); + tmpName = i18n("Area: %1").tqarg(tmpName); m_rangeName->setText(tmpName); } -void reference::slotHighlighted(QListBoxItem * ) +void reference::slotHighlighted(TQListBoxItem * ) { - QString tmp = m_list->text(m_list->currentItem()); + TQString tmp = m_list->text(m_list->currentItem()); displayAreaValues(tmp); } -void reference::slotDoubleClicked(QListBoxItem *) +void reference::slotDoubleClicked(TQListBoxItem *) { slotOk(); } @@ -158,19 +158,19 @@ void reference::slotRemove() if (ret == KMessageBox::Cancel) return; - QString textRemove; + TQString textRemove; if ( m_list->currentItem() != -1) { m_pView->doc()->emitBeginOperation( false ); - QString textRemove = m_list->text(m_list->currentItem()); + TQString textRemove = m_list->text(m_list->currentItem()); m_pView->doc()->removeArea(textRemove ); m_pView->doc()->setModified(true); /* m_list->clear(); - QString text; - QValueList<Reference>::Iterator it; - QValueList<Reference> area=m_pView->doc()->listArea(); + TQString text; + TQValueList<Reference>::Iterator it; + TQValueList<Reference> area=m_pView->doc()->listArea(); for ( it = area.begin(); it != area.end(); ++it ) { text=(*it).ref_name; @@ -200,14 +200,14 @@ void reference::slotRemove() void reference::slotEdit() { - QString name(m_list->text(m_list->currentItem())); + TQString name(m_list->text(m_list->currentItem())); if ( name.isEmpty() ) return; EditAreaName editDlg( m_pView, "EditArea", name ); editDlg.exec(); - m_rangeName->setText(i18n("Area: %1").arg("")); - QString tmp = m_list->text(m_list->currentItem()); + m_rangeName->setText(i18n("Area: %1").tqarg("")); + TQString tmp = m_list->text(m_list->currentItem()); if (!tmp.isEmpty()) displayAreaValues( tmp ); } @@ -216,12 +216,12 @@ void reference::slotOk() { m_pView->doc()->emitBeginOperation( false ); - QString text; + TQString text; if (m_list->currentItem() != -1) { int index = m_list->currentItem(); text = m_list->text(index); - QValueList<Reference> area = m_pView->doc()->listArea(); + TQValueList<Reference> area = m_pView->doc()->listArea(); if (m_pView->activeSheet()->sheetName() != area[ index ].sheet_name) { @@ -246,60 +246,60 @@ void reference::slotCancel() -EditAreaName::EditAreaName( View * parent, +EditAreaName::EditAreaName( View * tqparent, const char * name, - QString const & areaname ) - : KDialogBase( parent, name ,true,i18n( "Edit Area" ) , Ok|Cancel ) + TQString const & areaname ) + : KDialogBase( tqparent, name ,true,i18n( "Edit Area" ) , Ok|Cancel ) { - m_pView = parent; + m_pView = tqparent; resize( 350, 142 ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, - (QSizePolicy::SizeType)4, 0, 0, + tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, + (TQSizePolicy::SizeType)4, 0, 0, sizePolicy().hasHeightForWidth() ) ); - QWidget * page = new QWidget( this ); + TQWidget * page = new TQWidget( this ); setMainWidget(page); - QGridLayout * EditAreaNameLayout - = new QGridLayout( page, 1, 1, 11, 6, "EditAreaNameLayout"); + TQGridLayout * EditAreaNameLayout + = new TQGridLayout( page, 1, 1, 11, 6, "EditAreaNameLayout"); - QHBoxLayout * Layout1 = new QHBoxLayout( 0, 0, 6, "Layout1"); - QSpacerItem * spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, - QSizePolicy::Minimum ); + TQHBoxLayout * Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1"); + TQSpacerItem * spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, + TQSizePolicy::Minimum ); Layout1->addItem( spacer ); EditAreaNameLayout->addMultiCellLayout( Layout1, 3, 3, 0, 1 ); - QLabel * TextLabel4 = new QLabel( page, "TextLabel4" ); + TQLabel * TextLabel4 = new TQLabel( page, "TextLabel4" ); TextLabel4->setText( i18n( "Cells:" ) ); EditAreaNameLayout->addWidget( TextLabel4, 2, 0 ); - m_area = new QLineEdit( page, "m_area" ); + m_area = new TQLineEdit( page, "m_area" ); EditAreaNameLayout->addWidget( m_area, 2, 1 ); - QLabel * TextLabel1 = new QLabel( page, "TextLabel1" ); + TQLabel * TextLabel1 = new TQLabel( page, "TextLabel1" ); TextLabel1->setText( i18n( "Sheet:" ) ); EditAreaNameLayout->addWidget( TextLabel1, 1, 0 ); - m_sheets = new QComboBox( FALSE, page, "m_sheets" ); + m_sheets = new TQComboBox( FALSE, page, "m_sheets" ); EditAreaNameLayout->addWidget( m_sheets, 1, 1 ); - QLabel * TextLabel2 = new QLabel( page, "TextLabel2" ); + TQLabel * TextLabel2 = new TQLabel( page, "TextLabel2" ); TextLabel2->setText( i18n( "Area name:" ) ); EditAreaNameLayout->addWidget( TextLabel2, 0, 0 ); - m_areaName = new QLabel( page, "m_areaName" ); + m_areaName = new TQLabel( page, "m_areaName" ); m_areaName->setText( areaname ); EditAreaNameLayout->addWidget( m_areaName, 0, 1 ); - QPtrList<Sheet> sheetList = m_pView->doc()->map()->sheetList(); + TQPtrList<Sheet> sheetList = m_pView->doc()->map()->sheetList(); for (unsigned int c = 0; c < sheetList.count(); ++c) { Sheet * t = sheetList.at(c); @@ -308,9 +308,9 @@ EditAreaName::EditAreaName( View * parent, m_sheets->insertItem( t->sheetName() ); } - QString tmpName; - QValueList<Reference>::Iterator it; - QValueList<Reference> area(m_pView->doc()->listArea()); + TQString tmpName; + TQValueList<Reference>::Iterator it; + TQValueList<Reference> area(m_pView->doc()->listArea()); for ( it = area.begin(); it != area.end(); ++it ) { if ((*it).ref_name == areaname) diff --git a/kspread/dialogs/kspread_dlg_reference.h b/kspread/dialogs/kspread_dlg_reference.h index 3ba3e7610..30932101d 100644 --- a/kspread/dialogs/kspread_dlg_reference.h +++ b/kspread/dialogs/kspread_dlg_reference.h @@ -28,52 +28,54 @@ #include <kdialogbase.h> -class QComboBox; -class QLabel; -class QLineEdit; -class QPushButton; -class QListBox; -class QListBoxItem; +class TQComboBox; +class TQLabel; +class TQLineEdit; +class TQPushButton; +class TQListBox; +class TQListBoxItem; namespace KSpread { class View; -class reference: public QDialog +class reference: public TQDialog { Q_OBJECT + TQ_OBJECT public: - reference( View* parent, const char* name ); + reference( View* tqparent, const char* name ); public slots: void slotOk(); void slotCancel(); - void slotDoubleClicked(QListBoxItem *); + void slotDoubleClicked(TQListBoxItem *); void slotRemove(); void slotEdit(); - void slotHighlighted(QListBoxItem *); + void slotHighlighted(TQListBoxItem *); protected: View * m_pView; - QListBox * m_list; - QPushButton * m_pOk; - QPushButton * m_pCancel; - QPushButton * m_pEdit; - QPushButton * m_pRemove; - QLabel * m_rangeName; + TQListBox * m_list; + TQPushButton * m_pOk; + TQPushButton * m_pCancel; + TQPushButton * m_pEdit; + TQPushButton * m_pRemove; + TQLabel * m_rangeName; private: - void displayAreaValues(QString const & areaName); + void displayAreaValues(TQString const & areaName); }; class EditAreaName : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - EditAreaName( View * parent, const char * name, - QString const & areaname ); + EditAreaName( View * tqparent, const char * name, + TQString const & areaname ); ~EditAreaName(); public slots: @@ -82,9 +84,9 @@ public slots: private: View * m_pView; - QLineEdit * m_area; - QComboBox * m_sheets; - QLabel * m_areaName; + TQLineEdit * m_area; + TQComboBox * m_sheets; + TQLabel * m_areaName; }; } // namespace KSpread diff --git a/kspread/dialogs/kspread_dlg_resize2.cc b/kspread/dialogs/kspread_dlg_resize2.cc index 43e9cd4d0..d287ee4fa 100644 --- a/kspread/dialogs/kspread_dlg_resize2.cc +++ b/kspread/dialogs/kspread_dlg_resize2.cc @@ -25,8 +25,8 @@ #include <float.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <knuminput.h> @@ -47,22 +47,22 @@ using namespace KSpread; -ResizeRow::ResizeRow( View* parent, const char* name ) - : KDialogBase( parent, name, true, i18n("Resize Row"), Ok|Cancel|Default ) +ResizeRow::ResizeRow( View* tqparent, const char* name ) + : KDialogBase( tqparent, name, true, i18n("Resize Row"), Ok|Cancel|Default ) { - m_pView = parent; + m_pView = tqparent; - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget( page ); - QVBoxLayout *vLay = new QVBoxLayout( page, 0, spacingHint() ); - QHBoxLayout *hLay = new QHBoxLayout( vLay ); + TQVBoxLayout *vLay = new TQVBoxLayout( page, 0, spacingHint() ); + TQHBoxLayout *hLay = new TQHBoxLayout( vLay ); - QRect selection( m_pView->selectionInfo()->selection() ); + TQRect selection( m_pView->selectionInfo()->selection() ); RowFormat* rl = m_pView->activeSheet()->rowFormat( selection.top() ); rowHeight = rl->dblHeight(); - QLabel * label1 = new QLabel( page, "label1" ); + TQLabel * label1 = new TQLabel( page, "label1" ); label1->setText( i18n( "Height:" ) ); hLay->addWidget( label1 ); @@ -72,11 +72,11 @@ ResizeRow::ResizeRow( View* parent, const char* name ) hLay->addWidget( m_pHeight ); - QWidget *hSpacer = new QWidget( page ); + TQWidget *hSpacer = new TQWidget( page ); hSpacer->setMinimumSize( spacingHint(), spacingHint() ); hLay->addWidget( hSpacer ); - QWidget *vSpacer = new QWidget( page ); + TQWidget *vSpacer = new TQWidget( page ); vSpacer->setMinimumSize( spacingHint(), spacingHint() ); vLay->addWidget( vSpacer ); @@ -113,22 +113,22 @@ void ResizeRow::slotDefault() m_pHeight->setValue(KoUnit::toUserValue(points, m_pView->doc()->unit())); } -ResizeColumn::ResizeColumn( View* parent, const char* name ) - : KDialogBase( parent, name, true, i18n("Resize Column"), Ok|Cancel|Default ) +ResizeColumn::ResizeColumn( View* tqparent, const char* name ) + : KDialogBase( tqparent, name, true, i18n("Resize Column"), Ok|Cancel|Default ) { - m_pView = parent; + m_pView = tqparent; - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QVBoxLayout *vLay = new QVBoxLayout( page, 0, spacingHint() ); - QHBoxLayout *hLay = new QHBoxLayout( vLay ); + TQVBoxLayout *vLay = new TQVBoxLayout( page, 0, spacingHint() ); + TQHBoxLayout *hLay = new TQHBoxLayout( vLay ); - QRect selection( m_pView->selectionInfo()->selection() ); + TQRect selection( m_pView->selectionInfo()->selection() ); ColumnFormat* cl = m_pView->activeSheet()->columnFormat( selection.left() ); columnWidth = cl->dblWidth(); - QLabel * label1 = new QLabel( page, "label1" ); + TQLabel * label1 = new TQLabel( page, "label1" ); label1->setText( i18n( "Width:" ) ); hLay->addWidget( label1 ); @@ -138,11 +138,11 @@ ResizeColumn::ResizeColumn( View* parent, const char* name ) hLay->addWidget( m_pWidth ); - QWidget *hSpacer = new QWidget( page ); + TQWidget *hSpacer = new TQWidget( page ); hSpacer->setMinimumSize( spacingHint(), spacingHint() ); hLay->addWidget( hSpacer ); - QWidget *vSpacer = new QWidget( page ); + TQWidget *vSpacer = new TQWidget( page ); vSpacer->setMinimumSize( spacingHint(), spacingHint() ); vLay->addWidget( vSpacer ); diff --git a/kspread/dialogs/kspread_dlg_resize2.h b/kspread/dialogs/kspread_dlg_resize2.h index 395796acc..3e955f18b 100644 --- a/kspread/dialogs/kspread_dlg_resize2.h +++ b/kspread/dialogs/kspread_dlg_resize2.h @@ -38,9 +38,10 @@ class View; class ResizeRow: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ResizeRow( View* parent, const char* name = 0 ); + ResizeRow( View* tqparent, const char* name = 0 ); double rowHeight; protected slots: @@ -55,9 +56,10 @@ protected: class ResizeColumn: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ResizeColumn( View* parent, const char* name = 0 ); + ResizeColumn( View* tqparent, const char* name = 0 ); double columnWidth; protected slots: diff --git a/kspread/dialogs/kspread_dlg_series.cc b/kspread/dialogs/kspread_dlg_series.cc index 666beee60..725859d33 100644 --- a/kspread/dialogs/kspread_dlg_series.cc +++ b/kspread/dialogs/kspread_dlg_series.cc @@ -30,70 +30,70 @@ #include "kspread_sheet.h" #include "kspread_view.h" -#include <qlayout.h> +#include <tqlayout.h> #include <klocale.h> -#include <qlabel.h> +#include <tqlabel.h> -#include <qbuttongroup.h> -#include <qgroupbox.h> +#include <tqbuttongroup.h> +#include <tqgroupbox.h> #include <kmessagebox.h> #include <knumvalidator.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlineedit.h> -#include <qwhatsthis.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> +#include <tqwhatsthis.h> #include <knuminput.h> using namespace KSpread; -SeriesDlg::SeriesDlg( View* parent, const char* name,const QPoint &_marker) - : KDialogBase( parent, name,TRUE,i18n("Series"),Ok|Cancel ) +SeriesDlg::SeriesDlg( View* tqparent, const char* name,const TQPoint &_marker) + : KDialogBase( tqparent, name,TRUE,i18n("Series"),Ok|Cancel ) { - m_pView = parent; + m_pView = tqparent; marker=_marker; - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QBoxLayout *grid1 = new QHBoxLayout(page); + TQBoxLayout *grid1 = new TQHBoxLayout(page); grid1->setSpacing( spacingHint() ); - QButtonGroup* gb1 = new QButtonGroup( 2, Qt::Vertical, + TQButtonGroup* gb1 = new TQButtonGroup( 2, Qt::Vertical, i18n("Insert Values"), page ); - column = new QRadioButton( i18n("Vertical"), gb1 ); - QWhatsThis::add(column, i18n("Insert the series vertically, one below the other") ); - row = new QRadioButton( i18n("Horizontal"), gb1 ); - QWhatsThis::add(row, i18n("Insert the series horizontally, from left to right") ); + column = new TQRadioButton( i18n("Vertical"), gb1 ); + TQWhatsThis::add(column, i18n("Insert the series vertically, one below the other") ); + row = new TQRadioButton( i18n("Horizontal"), gb1 ); + TQWhatsThis::add(row, i18n("Insert the series horizontally, from left to right") ); column->setChecked(true); - QButtonGroup* gb2 = new QButtonGroup( 2, Qt::Vertical, + TQButtonGroup* gb2 = new TQButtonGroup( 2, Qt::Vertical, i18n("Type"), page ); - linear = new QRadioButton( i18n("Linear (2,4,6,...)"), gb2 ); - QWhatsThis::add(linear, i18n("Generate a series from 'start' to 'end' and for each step add " + linear = new TQRadioButton( i18n("Linear (2,4,6,...)"), gb2 ); + TQWhatsThis::add(linear, i18n("Generate a series from 'start' to 'end' and for each step add " "the value provided in step. This creates a series where each value " "is 'step' larger than the value before it.") ); - geometric = new QRadioButton( i18n("Geometric (2,4,8,...)"), gb2 ); - QWhatsThis::add(geometric, i18n("Generate a series from 'start' to 'end' and for each step multiply " + geometric = new TQRadioButton( i18n("Geometric (2,4,8,...)"), gb2 ); + TQWhatsThis::add(geometric, i18n("Generate a series from 'start' to 'end' and for each step multiply " "the value with the value provided in step. Using a step of 5 produces a list like: " "5, 25, 125, 625 since 5 multiplied by 5 (step) equals 25, and that multiplied by 5 equals 125, " "which multiplied by the same step-value of 5 equals 625.") ); linear->setChecked(true); - QGroupBox* gb = new QGroupBox( 1, Qt::Vertical, i18n("Parameters"), page ); - QWidget *params = new QWidget( gb ); - QGridLayout *params_layout = new QGridLayout( params, 3, 2 ); + TQGroupBox* gb = new TQGroupBox( 1, Qt::Vertical, i18n("Parameters"), page ); + TQWidget *params = new TQWidget( gb ); + TQGridLayout *params_layout = new TQGridLayout( params, 3, 2 ); params_layout->setSpacing( spacingHint() ); params_layout->setAutoAdd( true ); - new QLabel( i18n( "Start value:" ), params ); + new TQLabel( i18n( "Start value:" ), params ); start=new KDoubleNumInput(-999999.999, 999999.99, 0.0, 1.0, 3, params); - new QLabel( i18n( "Stop value:" ), params ); + new TQLabel( i18n( "Stop value:" ), params ); end=new KDoubleNumInput(-999999.999, 999999.99, 0.0, 1.0, 3, params); - new QLabel( i18n( "Step value:" ), params ); + new TQLabel( i18n( "Step value:" ), params ); step=new KDoubleNumInput(-999999.999, 999999.99, 0.0, 1.0, 3, params); grid1->addWidget(gb); @@ -103,16 +103,16 @@ SeriesDlg::SeriesDlg( View* parent, const char* name,const QPoint &_marker) start->setFocus(); - connect( this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) ); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); } void SeriesDlg::slotOk() { - Series mode=Column; //same as Vertical - Series type=Linear; // same as Horizontal - QString tmp; + Series mode=Column; //same asQt::Vertical + Series type=Linear; // same asQt::Horizontal + TQString tmp; double dstep, dend, dstart; Sheet * m_pSheet; m_pSheet = m_pView->activeSheet(); @@ -193,8 +193,8 @@ void SeriesDlg::slotOk() } } - // double val_end = QMAX(dend, dstart); - // double val_start = QMIN(dend, dstart); + // double val_end = TQMAX(dend, dstart); + // double val_start = TQMIN(dend, dstart); m_pView->doc()->emitBeginOperation( false ); m_pSheet->setSeries( marker, dstart, dend, dstep, mode, type ); diff --git a/kspread/dialogs/kspread_dlg_series.h b/kspread/dialogs/kspread_dlg_series.h index 9d056eadd..fd7cc5486 100644 --- a/kspread/dialogs/kspread_dlg_series.h +++ b/kspread/dialogs/kspread_dlg_series.h @@ -28,8 +28,8 @@ #include <kdialogbase.h> -class QRadioButton; -class QCheckBox; +class TQRadioButton; +class TQCheckBox; class KDoubleNumInput; namespace KSpread @@ -40,9 +40,10 @@ class View; class SeriesDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SeriesDlg(View* parent, const char* name,const QPoint &_marker); + SeriesDlg(View* tqparent, const char* name,const TQPoint &_marker); Sheet* sheet; @@ -54,11 +55,11 @@ protected: KDoubleNumInput *end; KDoubleNumInput *step; - QRadioButton* column; - QRadioButton* row; - QRadioButton* linear; - QRadioButton* geometric; - QPoint marker; + TQRadioButton* column; + TQRadioButton* row; + TQRadioButton* linear; + TQRadioButton* geometric; + TQPoint marker; }; } // namespace KSpread diff --git a/kspread/dialogs/kspread_dlg_show.cc b/kspread/dialogs/kspread_dlg_show.cc index fd4ba8010..0719eb07e 100644 --- a/kspread/dialogs/kspread_dlg_show.cc +++ b/kspread/dialogs/kspread_dlg_show.cc @@ -22,10 +22,10 @@ * Boston, MA 02110-1301, USA. */ -#include <qlayout.h> +#include <tqlayout.h> #include <klocale.h> -#include <qlistbox.h> -#include <qlabel.h> +#include <tqlistbox.h> +#include <tqlabel.h> #include <kcommand.h> @@ -38,24 +38,24 @@ using namespace KSpread; -ShowDialog::ShowDialog( View* parent, const char* name ) - : KDialogBase( parent, name,TRUE,i18n("Show Sheet"),Ok|Cancel ) +ShowDialog::ShowDialog( View* tqparent, const char* name ) + : KDialogBase( tqparent, name,TRUE,i18n("Show Sheet"),Ok|Cancel ) { - m_pView = parent; - QWidget *page = new QWidget( this ); + m_pView = tqparent; + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QVBoxLayout *lay1 = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); - QLabel *label = new QLabel( i18n("Select hidden sheets to show:"), page ); + TQLabel *label = new TQLabel( i18n("Select hidden sheets to show:"), page ); lay1->addWidget( label ); - list=new QListBox(page); + list=new TQListBox(page); lay1->addWidget( list ); - list->setSelectionMode(QListBox::Multi); - QString text; - QStringList::Iterator it; - QStringList tabsList=m_pView->doc()->map()->hiddenSheets(); + list->setSelectionMode(TQListBox::Multi); + TQString text; + TQStringList::Iterator it; + TQStringList tabsList=m_pView->doc()->map()->hiddenSheets(); for ( it = tabsList.begin(); it != tabsList.end(); ++it ) { text=*it; @@ -63,13 +63,13 @@ ShowDialog::ShowDialog( View* parent, const char* name ) } if(!list->count()) enableButtonOK(false); - connect( this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) ); - connect( list, SIGNAL(doubleClicked(QListBoxItem *)),this,SLOT(slotDoubleClicked(QListBoxItem *))); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect( list, TQT_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQT_SLOT(slotDoubleClicked(TQListBoxItem *))); resize( 200, 150 ); setFocus(); } -void ShowDialog::slotDoubleClicked(QListBoxItem *) +void ShowDialog::slotDoubleClicked(TQListBoxItem *) { slotOk(); } @@ -80,7 +80,7 @@ void ShowDialog::slotOk() { m_pView->doc()->emitBeginOperation( false ); - QStringList listSheet; + TQStringList listSheet; for (int i=0; i < list->numRows(); i++) { @@ -97,7 +97,7 @@ void ShowDialog::slotOk() Sheet *sheet; KMacroCommand *macroUndo=new KMacroCommand( i18n("Show Sheet") ); - for ( QStringList::Iterator it = listSheet.begin(); it != listSheet.end(); ++it ) + for ( TQStringList::Iterator it = listSheet.begin(); it != listSheet.end(); ++it ) { sheet=m_pView->doc()->map()->findSheet( *it ); KCommand* command = new ShowSheetCommand( sheet ); diff --git a/kspread/dialogs/kspread_dlg_show.h b/kspread/dialogs/kspread_dlg_show.h index f3772aeac..239e18b64 100644 --- a/kspread/dialogs/kspread_dlg_show.h +++ b/kspread/dialogs/kspread_dlg_show.h @@ -27,7 +27,7 @@ #include <kdialogbase.h> -class QListBox; +class TQListBox; namespace KSpread { @@ -36,17 +36,18 @@ class View; class ShowDialog: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ShowDialog( View* parent, const char* name ); + ShowDialog( View* tqparent, const char* name ); public slots: void slotOk(); - void slotDoubleClicked(QListBoxItem *); + void slotDoubleClicked(TQListBoxItem *); protected: View* m_pView; - QListBox * list; + TQListBox * list; }; } // namespace KSpread diff --git a/kspread/dialogs/kspread_dlg_showColRow.cc b/kspread/dialogs/kspread_dlg_showColRow.cc index 908d8bbc3..0a8ea14d9 100644 --- a/kspread/dialogs/kspread_dlg_showColRow.cc +++ b/kspread/dialogs/kspread_dlg_showColRow.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <klocale.h> @@ -35,17 +35,17 @@ using namespace KSpread; -ShowColRow::ShowColRow( View* parent, const char* name, Type _type ) - : KDialogBase( parent, name,TRUE,"",Ok|Cancel ) +ShowColRow::ShowColRow( View* tqparent, const char* name, Type _type ) + : KDialogBase( tqparent, name,TRUE,"",Ok|Cancel ) { - m_pView = parent; + m_pView = tqparent; typeShow=_type; - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QVBoxLayout *lay1 = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); - QLabel *label = new QLabel( page ); + TQLabel *label = new TQLabel( page ); if(_type==Column) { setCaption( i18n("Show Columns") ); @@ -56,7 +56,7 @@ ShowColRow::ShowColRow( View* parent, const char* name, Type _type ) label->setText(i18n("Select hidden rows to show:")); } - list=new QListBox(page); + list=new TQListBox(page); lay1->addWidget( label ); lay1->addWidget( list ); @@ -66,21 +66,21 @@ ShowColRow::ShowColRow( View* parent, const char* name, Type _type ) { ColumnFormat *col=m_pView->activeSheet()->firstCol(); - QString text; - QStringList listCol; + TQString text; + TQStringList listCol; for( ; col; col = col->next() ) { if(col->isHide()) listInt.append(col->column()); } qHeapSort(listInt); - QValueList<int>::Iterator it; + TQValueList<int>::Iterator it; for( it = listInt.begin(); it != listInt.end(); ++it ) { if(!showColNumber) - listCol+=i18n("Column: %1").arg(Cell::columnName(*it)); + listCol+=i18n("Column: %1").tqarg(Cell::columnName(*it)); else - listCol+=i18n("Column: %1").arg(text.setNum(*it)); + listCol+=i18n("Column: %1").tqarg(text.setNum(*it)); } list->insertStringList(listCol); } @@ -88,17 +88,17 @@ ShowColRow::ShowColRow( View* parent, const char* name, Type _type ) { RowFormat *row=m_pView->activeSheet()->firstRow(); - QString text; - QStringList listRow; + TQString text; + TQStringList listRow; for( ; row; row = row->next() ) { if(row->isHide()) listInt.append(row->row()); } qHeapSort(listInt); - QValueList<int>::Iterator it; + TQValueList<int>::Iterator it; for( it = listInt.begin(); it != listInt.end(); ++it ) - listRow+=i18n("Row: %1").arg(text.setNum(*it)); + listRow+=i18n("Row: %1").tqarg(text.setNum(*it)); list->insertStringList(listRow); } @@ -107,14 +107,14 @@ ShowColRow::ShowColRow( View* parent, const char* name, Type _type ) enableButtonOK(false); //selection multiple - list->setSelectionMode(QListBox::Multi); - connect( this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) ); - connect( list, SIGNAL(doubleClicked(QListBoxItem *)),this,SLOT(slotDoubleClicked(QListBoxItem *))); + list->setSelectionMode(TQListBox::Multi); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect( list, TQT_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQT_SLOT(slotDoubleClicked(TQListBoxItem *))); resize( 200, 150 ); setFocus(); } -void ShowColRow::slotDoubleClicked(QListBoxItem *) +void ShowColRow::slotDoubleClicked(TQListBoxItem *) { slotOk(); } @@ -128,11 +128,11 @@ void ShowColRow::slotOk() { if (typeShow == Column) { - region.add(QRect(*listInt.at(i), 1, 1, KS_rowMax)); + region.add(TQRect(*listInt.at(i), 1, 1, KS_rowMax)); } if (typeShow == Row) { - region.add(QRect(1, *listInt.at(i), KS_colMax, 1)); + region.add(TQRect(1, *listInt.at(i), KS_colMax, 1)); } } } diff --git a/kspread/dialogs/kspread_dlg_showColRow.h b/kspread/dialogs/kspread_dlg_showColRow.h index 572f98b22..c0bdc5916 100644 --- a/kspread/dialogs/kspread_dlg_showColRow.h +++ b/kspread/dialogs/kspread_dlg_showColRow.h @@ -23,11 +23,11 @@ #ifndef __kspread_dlg_showColRow__ #define __kspread_dlg_showColRow__ -#include <qvaluelist.h> +#include <tqvaluelist.h> #include <kdialogbase.h> -class QListBox; +class TQListBox; namespace KSpread { @@ -36,19 +36,20 @@ class View; class ShowColRow: public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum Type { Column, Row }; - ShowColRow( View* parent, const char* name, Type _type ); + ShowColRow( View* tqparent, const char* name, Type _type ); public slots: void slotOk(); - void slotDoubleClicked(QListBoxItem *); + void slotDoubleClicked(TQListBoxItem *); protected: View* m_pView; - QListBox * list; + TQListBox * list; Type typeShow; - QValueList<int> listInt; + TQValueList<int> listInt; }; } // namespace KSpread diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc index 6539d149a..ac7cd1874 100644 --- a/kspread/dialogs/kspread_dlg_sort.cc +++ b/kspread/dialogs/kspread_dlg_sort.cc @@ -26,20 +26,20 @@ */ -#include <qbuttongroup.h> -#include <qhbuttongroup.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qrect.h> -#include <qtabwidget.h> -#include <qwidget.h> -#include <qvbox.h> +#include <tqbuttongroup.h> +#include <tqhbuttongroup.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqrect.h> +#include <tqtabwidget.h> +#include <tqwidget.h> +#include <tqvbox.h> #include <kconfig.h> #include <kdebug.h> @@ -56,10 +56,10 @@ using namespace KSpread; -SortDialog::SortDialog( View * parent, const char * name, +SortDialog::SortDialog( View * tqparent, const char * name, bool modal ) - : KDialogBase( parent, name, modal,"Sort",Ok|Cancel ), - m_pView( parent ) + : KDialogBase( tqparent, name, modal,"Sort",Ok|Cancel ), + m_pView( tqparent ) { if ( !name ) setName( "SortDialog" ); @@ -68,96 +68,96 @@ SortDialog::SortDialog( View * parent, const char * name, setCaption( i18n( "Sorting" ) ); //setSizeGripEnabled( true ); - QVBox *page = makeVBoxMainWidget(); + TQVBox *page = makeVBoxMainWidget(); - m_tabWidget = new QTabWidget( page, "m_tabWidget" ); + m_tabWidget = new TQTabWidget( page, "m_tabWidget" ); - m_page1 = new QWidget( m_tabWidget, "m_page1" ); - QGridLayout * page1Layout - = new QGridLayout( m_page1, 1, 1, 11, 6, "page1Layout"); + m_page1 = new TQWidget( m_tabWidget, "m_page1" ); + TQGridLayout * page1Layout + = new TQGridLayout( m_page1, 1, 1, 11, 6, "page1Layout"); //---------------- Sort Layout & Header Row/Column Toggle //Sort orientation selector (for selecting Left-To-Right or Top-To-Bottom sorting of the selection) - QGroupBox* layoutGroup = new QGroupBox(2 , Qt::Vertical, m_page1, "layoutGroup"); - layoutGroup->setTitle( i18n("Layout") ); + TQGroupBox* tqlayoutGroup = new TQGroupBox(2 , Qt::Vertical, m_page1, "tqlayoutGroup"); + tqlayoutGroup->setTitle( i18n("Layout") ); - QHButtonGroup * orientationGroup = new QHButtonGroup( layoutGroup, "orientationGroup" ); + TQHButtonGroup * orientationGroup = new TQHButtonGroup( tqlayoutGroup, "orientationGroup" ); orientationGroup->setLineWidth(0); orientationGroup->setMargin(0); - orientationGroup->layout()->setMargin(0); + orientationGroup->tqlayout()->setMargin(0); - m_sortColumn = new QRadioButton( orientationGroup, "m_sortColumn" ); + m_sortColumn = new TQRadioButton( orientationGroup, "m_sortColumn" ); m_sortColumn->setText( i18n( "Sort &Rows" ) ); - m_sortRow = new QRadioButton( orientationGroup, "m_sortRow" ); + m_sortRow = new TQRadioButton( orientationGroup, "m_sortRow" ); m_sortRow->setText( i18n( "Sort &Columns" ) ); //First row / column contains header toggle - m_firstRowOrColHeader = new QCheckBox( layoutGroup, "m_copyLayout" ); + m_firstRowOrColHeader = new TQCheckBox( tqlayoutGroup, "m_copyLayout" ); //m_firstRowOrColHeader->setText( i18n( "&First row contains headers" ) ); m_firstRowOrColHeader->setChecked(true); - page1Layout->addWidget(layoutGroup,0,0); + page1Layout->addWidget(tqlayoutGroup,0,0); //---------------- page1Layout->addRowSpacing(2,10); - QGroupBox * sort1Box = new QGroupBox( m_page1, "sort1Box" ); + TQGroupBox * sort1Box = new TQGroupBox( m_page1, "sort1Box" ); sort1Box->setTitle( i18n( "Sort By" ) ); sort1Box->setFlat(true); sort1Box->setColumnLayout(0, Qt::Vertical ); - sort1Box->layout()->setSpacing( KDialog::spacingHint() ); - sort1Box->layout()->setMargin( KDialog::marginHint() ); - QHBoxLayout * sort1BoxLayout = new QHBoxLayout( sort1Box->layout() ); - sort1BoxLayout->setAlignment( Qt::AlignTop ); + sort1Box->tqlayout()->setSpacing( KDialog::spacingHint() ); + sort1Box->tqlayout()->setMargin( KDialog::marginHint() ); + TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->tqlayout() ); + sort1BoxLayout->tqsetAlignment( TQt::AlignTop ); - m_sortKey1 = new QComboBox( false, sort1Box, "m_sortKey1" ); + m_sortKey1 = new TQComboBox( false, sort1Box, "m_sortKey1" ); sort1BoxLayout->addWidget( m_sortKey1 ); - m_sortOrder1 = new QComboBox( false, sort1Box, "m_sortOrder1" ); + m_sortOrder1 = new TQComboBox( false, sort1Box, "m_sortOrder1" ); m_sortOrder1->insertItem( i18n( "Ascending" ) ); m_sortOrder1->insertItem( i18n( "Descending" ) ); sort1BoxLayout->addWidget( m_sortOrder1 ); page1Layout->addWidget( sort1Box, 3, 0 ); - QGroupBox * sort2Box = new QGroupBox( m_page1, "sort2Box" ); + TQGroupBox * sort2Box = new TQGroupBox( m_page1, "sort2Box" ); sort2Box->setTitle( i18n( "Then By" ) ); sort2Box->setFlat(true); sort2Box->setColumnLayout(0, Qt::Vertical ); - sort2Box->layout()->setSpacing( KDialog::spacingHint() ); - sort2Box->layout()->setMargin( KDialog::marginHint() ); - QHBoxLayout * sort2BoxLayout = new QHBoxLayout( sort2Box->layout() ); - sort2BoxLayout->setAlignment( Qt::AlignTop ); + sort2Box->tqlayout()->setSpacing( KDialog::spacingHint() ); + sort2Box->tqlayout()->setMargin( KDialog::marginHint() ); + TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->tqlayout() ); + sort2BoxLayout->tqsetAlignment( TQt::AlignTop ); - m_sortKey2 = new QComboBox( false, sort2Box, "m_sortKey2" ); + m_sortKey2 = new TQComboBox( false, sort2Box, "m_sortKey2" ); m_sortKey2->insertItem( i18n( "None" ) ); sort2BoxLayout->addWidget( m_sortKey2 ); - m_sortOrder2 = new QComboBox( false, sort2Box, "m_sortOrder2" ); + m_sortOrder2 = new TQComboBox( false, sort2Box, "m_sortOrder2" ); m_sortOrder2->insertItem( i18n( "Ascending" ) ); m_sortOrder2->insertItem( i18n( "Descending" ) ); sort2BoxLayout->addWidget( m_sortOrder2 ); page1Layout->addWidget( sort2Box, 4, 0 ); - QGroupBox * sort3Box = new QGroupBox( m_page1, "sort3Box" ); + TQGroupBox * sort3Box = new TQGroupBox( m_page1, "sort3Box" ); sort3Box->setTitle( i18n( "Then By" ) ); sort3Box->setFlat(true); sort3Box->setColumnLayout(0, Qt::Vertical ); - sort3Box->layout()->setSpacing( KDialog::spacingHint() ); - sort3Box->layout()->setMargin( KDialog::marginHint() ); - QHBoxLayout * sort3BoxLayout = new QHBoxLayout( sort3Box->layout() ); - sort3BoxLayout->setAlignment( Qt::AlignTop ); + sort3Box->tqlayout()->setSpacing( KDialog::spacingHint() ); + sort3Box->tqlayout()->setMargin( KDialog::marginHint() ); + TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->tqlayout() ); + sort3BoxLayout->tqsetAlignment( TQt::AlignTop ); - m_sortKey3 = new QComboBox( false, sort3Box, "m_sortKey3" ); + m_sortKey3 = new TQComboBox( false, sort3Box, "m_sortKey3" ); m_sortKey3->insertItem( i18n( "None" ) ); m_sortKey3->setEnabled( false ); sort3BoxLayout->addWidget( m_sortKey3 ); - m_sortOrder3 = new QComboBox( false, sort3Box, "m_sortOrder3" ); + m_sortOrder3 = new TQComboBox( false, sort3Box, "m_sortOrder3" ); m_sortOrder3->insertItem( i18n( "Ascending" ) ); m_sortOrder3->insertItem( i18n( "Descending" ) ); m_sortOrder3->setEnabled( false ); @@ -169,23 +169,23 @@ SortDialog::SortDialog( View * parent, const char * name, //---------------- options page - m_page2 = new QWidget( m_tabWidget, "m_page2" ); - QGridLayout * page2Layout = new QGridLayout( m_page2, 1, 1, 11, 6, "page2Layout"); - page2Layout->setAlignment(Qt::AlignTop); + m_page2 = new TQWidget( m_tabWidget, "m_page2" ); + TQGridLayout * page2Layout = new TQGridLayout( m_page2, 1, 1, 11, 6, "page2Layout"); + page2Layout->tqsetAlignment(TQt::AlignTop); - QGroupBox * firstKeyBox = new QGroupBox( m_page2, "firstKeyBox" ); + TQGroupBox * firstKeyBox = new TQGroupBox( m_page2, "firstKeyBox" ); firstKeyBox->setTitle( i18n( "First Key" ) ); firstKeyBox->setColumnLayout(0, Qt::Vertical ); - firstKeyBox->layout()->setSpacing( KDialog::spacingHint() ); - firstKeyBox->layout()->setMargin( KDialog::marginHint() ); - QVBoxLayout * firstKeyBoxLayout = new QVBoxLayout( firstKeyBox->layout() ); - firstKeyBoxLayout->setAlignment( Qt::AlignTop ); + firstKeyBox->tqlayout()->setSpacing( KDialog::spacingHint() ); + firstKeyBox->tqlayout()->setMargin( KDialog::marginHint() ); + TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->tqlayout() ); + firstKeyBoxLayout->tqsetAlignment( TQt::AlignTop ); - m_useCustomLists = new QCheckBox( firstKeyBox, "m_useCustomLists_2" ); + m_useCustomLists = new TQCheckBox( firstKeyBox, "m_useCustomLists_2" ); m_useCustomLists->setText( i18n( "&Use custom list" ) ); firstKeyBoxLayout->addWidget( m_useCustomLists ); - m_customList = new QComboBox( false, firstKeyBox, "m_customList" ); + m_customList = new TQComboBox( false, firstKeyBox, "m_customList" ); m_customList->setEnabled( false ); m_customList->setMaximumSize( 230, 30 ); firstKeyBoxLayout->addWidget( m_customList ); @@ -198,31 +198,31 @@ SortDialog::SortDialog( View * parent, const char * name, to just copy and paste the data and then sort the newly pasted data in place. -- Robert Knight - QGroupBox * resultToBox = new QGroupBox( m_page2, "resultToBox" ); + TQGroupBox * resultToBox = new TQGroupBox( m_page2, "resultToBox" ); resultToBox->setTitle( i18n( "Location to Store Sort Results" ) ); resultToBox->setColumnLayout(0, Qt::Vertical ); - resultToBox->layout()->setSpacing( KDialog::spacingHint() ); - resultToBox->layout()->setMargin( KDialog::marginHint() ); + resultToBox->tqlayout()->setSpacing( KDialog::spacingHint() ); + resultToBox->tqlayout()->setMargin( KDialog::marginHint() ); - QHBoxLayout * resultToBoxLayout = new QHBoxLayout( resultToBox->layout() ); - resultToBoxLayout->setAlignment( Qt::AlignTop ); + TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->tqlayout() ); + resultToBoxLayout->tqsetAlignment( TQt::AlignTop ); - QLabel * destinationSheet=new QLabel(resultToBox,"destinationSheet"); + TQLabel * destinationSheet=new TQLabel(resultToBox,"destinationSheet"); destinationSheet->setText("Destination Sheet:"); resultToBoxLayout->addWidget(destinationSheet); - m_outputSheet = new QComboBox( false, resultToBox, "m_outputSheet" ); + m_outputSheet = new TQComboBox( false, resultToBox, "m_outputSheet" ); resultToBoxLayout->addWidget( m_outputSheet ); - QSpacerItem * spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem * spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); resultToBoxLayout->addItem( spacer ); - QLabel * startingCellLabel = new QLabel( resultToBox, "destinationCellLabel" ); + TQLabel * startingCellLabel = new TQLabel( resultToBox, "destinationCellLabel" ); startingCellLabel->setText( i18n( "Destination Cell:" ) ); resultToBoxLayout->addWidget( startingCellLabel ); - m_outputCell = new QLineEdit( resultToBox, "m_outputCell" ); - m_outputCell->setMaximumSize( QSize( 60, 32767 ) ); + m_outputCell = new TQLineEdit( resultToBox, "m_outputCell" ); + m_outputCell->setMaximumSize( TQSize( 60, 32767 ) ); resultToBoxLayout->addWidget( m_outputCell ); page2Layout->addWidget( resultToBox, 1,0 );*/ @@ -230,43 +230,43 @@ SortDialog::SortDialog( View * parent, const char * name, m_tabWidget->insertTab( m_page2, i18n( "Options" ) ); - QHBoxLayout * Layout1 = new QHBoxLayout( 0, 0, 6, "Layout1"); - QSpacerItem * spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, - QSizePolicy::Minimum ); + TQHBoxLayout * Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1"); + TQSpacerItem * spacer_2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, + TQSizePolicy::Minimum ); Layout1->addItem( spacer_2 ); - m_copyLayout = new QCheckBox( m_page2, "m_copyLayout" ); + m_copyLayout = new TQCheckBox( m_page2, "m_copyLayout" ); m_copyLayout->setText( i18n( "Copy cell &formatting (Borders, Colours, Text Style)" ) ); page2Layout->addWidget( m_copyLayout, 1, 0 ); - m_respectCase = new QCheckBox( m_page2, "m_copyLayout" ); + m_respectCase = new TQCheckBox( m_page2, "m_copyLayout" ); m_respectCase->setText( i18n( "Case sensitive sort" ) ); m_respectCase->setChecked( true ); page2Layout->addWidget( m_respectCase, 2,0 ); - connect( m_sortKey2, SIGNAL( activated( int ) ), this, - SLOT( sortKey2textChanged( int ) ) ); - connect( m_useCustomLists, SIGNAL( stateChanged(int) ), this, - SLOT( useCustomListsStateChanged(int) ) ); - connect( m_firstRowOrColHeader, SIGNAL( stateChanged(int) ), this, - SLOT( firstRowHeaderChanged(int) ) ); - connect( orientationGroup, SIGNAL( pressed(int) ), this, - SLOT( slotOrientationChanged(int) ) ); + connect( m_sortKey2, TQT_SIGNAL( activated( int ) ), this, + TQT_SLOT( sortKey2textChanged( int ) ) ); + connect( m_useCustomLists, TQT_SIGNAL( stateChanged(int) ), this, + TQT_SLOT( useCustomListsStateChanged(int) ) ); + connect( m_firstRowOrColHeader, TQT_SIGNAL( stateChanged(int) ), this, + TQT_SLOT( firstRowHeaderChanged(int) ) ); + connect( orientationGroup, TQT_SIGNAL( pressed(int) ), this, + TQT_SLOT( slotOrientationChanged(int) ) ); init(); } -QRect SortDialog::sourceArea() +TQRect SortDialog::sourceArea() { return m_pView->selectionInfo()->selection(); } SortDialog::Orientation SortDialog::guessDataOrientation() { - const QRect selection=sourceArea(); + const TQRect selection=sourceArea(); if (selection.width() >= selection.height()) return SortColumns; @@ -276,12 +276,12 @@ SortDialog::Orientation SortDialog::guessDataOrientation() SortDialog::~SortDialog() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } void SortDialog::init() { - QStringList lst; + TQStringList lst; lst<<i18n("January"); lst<<i18n("February"); lst<<i18n("March"); @@ -305,9 +305,9 @@ void SortDialog::init() KConfig * config = Factory::global()->config(); config->setGroup( "Parameters" ); - QStringList other = config->readListEntry("Other list"); - QString tmp; - for ( QStringList::Iterator it = other.begin(); it != other.end(); ++it ) + TQStringList other = config->readListEntry("Other list"); + TQString tmp; + for ( TQStringList::Iterator it = other.begin(); it != other.end(); ++it ) { if((*it) != "\\") tmp += (*it) + ", "; @@ -320,7 +320,7 @@ void SortDialog::init() } m_customList->insertStringList(lst); - /*QPtrList<Sheet> sheetList = m_pView->doc()->map()->sheetList(); + /*TQPtrList<Sheet> sheetList = m_pView->doc()->map()->sheetList(); for (unsigned int c = 0; c < sheetList.count(); ++c) { Sheet * t = sheetList.at(c); @@ -330,10 +330,10 @@ void SortDialog::init() } m_outputSheet->setCurrentText( m_pView->activeSheet()->sheetName() );*/ - QRect r = sourceArea(); - /*QString cellArea; + TQRect r = sourceArea(); + /*TQString cellArea; cellArea += Cell::columnName(r.left()); - cellArea += QString::number( r.top() ); + cellArea += TQString::number( r.top() ); m_outputCell->setText( cellArea );*/ //If the top-most row or left-most column all contain text items (as opposed to numbers, dates etc.) @@ -350,8 +350,8 @@ void SortDialog::init() int right = r.right(); for (int i = r.left(); i <= right; ++i) { - QString guessName=m_pView->activeSheet()->guessColumnTitle(r,i); - QString colName=i18n(" (Column %1)").arg(Cell::columnName(i)); + TQString guessName=m_pView->activeSheet()->guessColumnTitle(r,i); + TQString colName=i18n(" (Column %1)").tqarg(Cell::columnName(i)); if (!guessName.isEmpty()) { @@ -359,13 +359,13 @@ void SortDialog::init() } else { - m_listColumn += i18n("Column %1").arg(Cell::columnName(i)); + m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i)); if ( i == r.left() ) selectionMayHaveHeader=false; } } - // m_listColumn += i18n("Column %1").arg(Cell::columnName(i)); + // m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i)); } // Entire rows selected ? else if ( util_isRowSelected(r) ) @@ -376,8 +376,8 @@ void SortDialog::init() int bottom = r.bottom(); for (int i = r.top(); i <= bottom; ++i) { - QString guessName=m_pView->activeSheet()->guessRowTitle(r,i); - QString rowName=i18n(" (Row %1)").arg(i); + TQString guessName=m_pView->activeSheet()->guessRowTitle(r,i); + TQString rowName=i18n(" (Row %1)").tqarg(i); if (!guessName.isEmpty()) { @@ -385,7 +385,7 @@ void SortDialog::init() } else { - m_listRow += i18n("Row %1").arg(i); + m_listRow += i18n("Row %1").tqarg(i); if ( i == r.top() ) selectionMayHaveHeader=false; @@ -418,14 +418,14 @@ void SortDialog::init() int bottom = r.bottom(); for (int i = r.left(); i <= right; ++i) { - QString guessName=m_pView->activeSheet()->guessColumnTitle(r,i); - QString colName=i18n(" (Column %1)").arg(Cell::columnName(i)); + TQString guessName=m_pView->activeSheet()->guessColumnTitle(r,i); + TQString colName=i18n(" (Column %1)").tqarg(Cell::columnName(i)); if (!guessName.isEmpty()) m_listColumn += guessName + colName; else { - m_listColumn += i18n("Column %1").arg(Cell::columnName(i)); + m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i)); if (i == r.left()) selectionMayHaveHeader=false; @@ -434,14 +434,14 @@ void SortDialog::init() for (int i = r.top(); i <= bottom; ++i) { - QString guessName=m_pView->activeSheet()->guessRowTitle(r,i); - QString rowName=i18n(" (Row %1)").arg(i); + TQString guessName=m_pView->activeSheet()->guessRowTitle(r,i); + TQString rowName=i18n(" (Row %1)").tqarg(i); if (!guessName.isEmpty()) m_listRow += guessName + rowName; else { - m_listRow += i18n("Row %1").arg(i); + m_listRow += i18n("Row %1").tqarg(i); if (i == r.top()) selectionMayHaveHeader=false; @@ -549,7 +549,7 @@ void SortDialog::slotOk() }*/ //outputPoint.setSheet(sheet); - QRect sortArea = sourceArea(); + TQRect sortArea = sourceArea(); Point outputPoint; outputPoint.setPos(sortArea.topLeft()); outputPoint.setSheet(sheet); @@ -574,7 +574,7 @@ void SortDialog::slotOk() int h = outputPoint.pos().y() + sortArea.height(); int w = outputPoint.pos().x() + sortArea.width(); - if ( sortArea.contains(outputPoint.pos()) + if ( sortArea.tqcontains(outputPoint.pos()) || ( w >= sortArea.left() && w <= sortArea.right() ) || ( h >= sortArea.top() && h <= sortArea.bottom() ) ) { @@ -589,7 +589,7 @@ void SortDialog::slotOk() int key1 = 1; int key2 = 0; int key3 = 0; - QStringList * firstKey = 0L; + TQStringList * firstKey = 0L; Sheet::SortingOrder order1; Sheet::SortingOrder order2; Sheet::SortingOrder order3; @@ -631,9 +631,9 @@ void SortDialog::slotOk() if ( m_useCustomLists->isChecked() ) { - firstKey = new QStringList(); - QString list = m_customList->currentText(); - QString tmp; + firstKey = new TQStringList(); + TQString list = m_customList->currentText(); + TQString tmp; int l = list.length(); for ( int i = 0; i < l; ++i ) { diff --git a/kspread/dialogs/kspread_dlg_sort.h b/kspread/dialogs/kspread_dlg_sort.h index 3ac295129..2abe5bda0 100644 --- a/kspread/dialogs/kspread_dlg_sort.h +++ b/kspread/dialogs/kspread_dlg_sort.h @@ -30,16 +30,16 @@ #include <kdialogbase.h> -#include <qstringlist.h> +#include <tqstringlist.h> -class QCheckBox; -class QComboBox; -class QLabel; -class QLineEdit; -class QPushButton; -class QRadioButton; -class QTabWidget; -class QWidget; +class TQCheckBox; +class TQComboBox; +class TQLabel; +class TQLineEdit; +class TQPushButton; +class TQRadioButton; +class TQTabWidget; +class TQWidget; namespace KSpread { @@ -49,6 +49,7 @@ class View; class SortDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum Orientation @@ -57,13 +58,13 @@ class SortDialog : public KDialogBase SortRows=1 }; - SortDialog( View * parent, const char * name = 0, + SortDialog( View * tqparent, const char * name = 0, bool modal = false ); ~SortDialog(); protected: Orientation guessDataOrientation(); - QRect sourceArea(); + TQRect sourceArea(); private slots: void sortKey2textChanged( int ); @@ -77,33 +78,33 @@ class SortDialog : public KDialogBase View * m_pView; - QStringList m_listColumn; - QStringList m_listRow; + TQStringList m_listColumn; + TQStringList m_listRow; - QWidget * m_page1; - QWidget * m_page2; + TQWidget * m_page1; + TQWidget * m_page2; - QTabWidget * m_tabWidget; + TQTabWidget * m_tabWidget; - QComboBox * m_sortKey1; - QComboBox * m_sortOrder1; - QComboBox * m_sortKey2; - QComboBox * m_sortOrder2; - QComboBox * m_sortKey3; - QComboBox * m_sortOrder3; + TQComboBox * m_sortKey1; + TQComboBox * m_sortOrder1; + TQComboBox * m_sortKey2; + TQComboBox * m_sortOrder2; + TQComboBox * m_sortKey3; + TQComboBox * m_sortOrder3; - QCheckBox * m_useCustomLists; - QComboBox * m_customList; + TQCheckBox * m_useCustomLists; + TQComboBox * m_customList; - QRadioButton * m_sortColumn; - QRadioButton * m_sortRow; + TQRadioButton * m_sortColumn; + TQRadioButton * m_sortRow; - QCheckBox * m_copyLayout; - QCheckBox * m_firstRowOrColHeader; - QCheckBox * m_respectCase; + TQCheckBox * m_copyLayout; + TQCheckBox * m_firstRowOrColHeader; + TQCheckBox * m_respectCase; - /*QComboBox * m_outputSheet; - QLineEdit * m_outputCell;*/ + /*TQComboBox * m_outputSheet; + TQLineEdit * m_outputCell;*/ }; } // namespace KSpread diff --git a/kspread/dialogs/kspread_dlg_special.cc b/kspread/dialogs/kspread_dlg_special.cc index 3c9426c76..192fea6d8 100644 --- a/kspread/dialogs/kspread_dlg_special.cc +++ b/kspread/dialogs/kspread_dlg_special.cc @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ -#include <qlayout.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> +#include <tqlayout.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> #include <klocale.h> @@ -36,47 +36,47 @@ using namespace KSpread; -SpecialDialog::SpecialDialog( View* parent, const char* name ) - : KDialogBase( parent, name, TRUE,i18n("Special Paste"),Ok|Cancel ) +SpecialDialog::SpecialDialog( View* tqparent, const char* name ) + : KDialogBase( tqparent, name, TRUE,i18n("Special Paste"),Ok|Cancel ) { - m_pView = parent; - QWidget *page = new QWidget( this ); + m_pView = tqparent; + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QVBoxLayout *lay1 = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); - QButtonGroup *grp = new QButtonGroup( 1, QGroupBox::Horizontal, i18n( "Paste What" ),page ); + TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Paste What" ),page ); grp->setRadioButtonExclusive( TRUE ); - grp->layout(); + grp->tqlayout(); lay1->addWidget(grp); - rb1 = new QRadioButton( i18n("Everything"), grp ); - rb2 = new QRadioButton( i18n("Text"), grp ); - rb3 = new QRadioButton( i18n("Format"), grp ); - rb10 = new QRadioButton( i18n("Comment"), grp ); - rb11 = new QRadioButton( i18n("Result"), grp ); + rb1 = new TQRadioButton( i18n("Everything"), grp ); + rb2 = new TQRadioButton( i18n("Text"), grp ); + rb3 = new TQRadioButton( i18n("Format"), grp ); + rb10 = new TQRadioButton( i18n("Comment"), grp ); + rb11 = new TQRadioButton( i18n("Result"), grp ); - rb4 = new QRadioButton( i18n("Everything without border"), grp ); + rb4 = new TQRadioButton( i18n("Everything without border"), grp ); rb1->setChecked(true); - grp = new QButtonGroup( 1, QGroupBox::Horizontal, i18n("Operation"),page); + grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Operation"),page); grp->setRadioButtonExclusive( TRUE ); - grp->layout(); + grp->tqlayout(); lay1->addWidget(grp); - rb5 = new QRadioButton( i18n("Overwrite"), grp ); - rb6 = new QRadioButton( i18n("Addition"), grp ); - rb7 = new QRadioButton( i18n("Subtraction"), grp ); - rb8 = new QRadioButton( i18n("Multiplication"), grp ); - rb9 = new QRadioButton( i18n("Division"), grp ); + rb5 = new TQRadioButton( i18n("Overwrite"), grp ); + rb6 = new TQRadioButton( i18n("Addition"), grp ); + rb7 = new TQRadioButton( i18n("Subtraction"), grp ); + rb8 = new TQRadioButton( i18n("Multiplication"), grp ); + rb9 = new TQRadioButton( i18n("Division"), grp ); rb5->setChecked(true); - // cb = new QCheckBox(i18n("Transpose"),this); - // cb->layout(); + // cb = new TQCheckBox(i18n("Transpose"),this); + // cb->tqlayout(); // lay1->addWidget(cb); - connect( this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) ); - connect( rb3, SIGNAL( toggled( bool ) ), this, SLOT( slotToggled( bool ) ) ); - connect( rb10, SIGNAL( toggled( bool ) ), this, SLOT( slotToggled( bool ) ) ); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect( rb3, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggled( bool ) ) ); + connect( rb10, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggled( bool ) ) ); } void SpecialDialog::slotOk() diff --git a/kspread/dialogs/kspread_dlg_special.h b/kspread/dialogs/kspread_dlg_special.h index 004913876..1e9f0eabf 100644 --- a/kspread/dialogs/kspread_dlg_special.h +++ b/kspread/dialogs/kspread_dlg_special.h @@ -26,7 +26,7 @@ #include <kdialogbase.h> -class QRadioButton; +class TQRadioButton; namespace KSpread { @@ -36,8 +36,9 @@ class View; class SpecialDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SpecialDialog( View* parent, const char* name ); + SpecialDialog( View* tqparent, const char* name ); public slots: void slotOk(); @@ -45,9 +46,9 @@ public slots: private: View* m_pView; - QRadioButton *rb1, *rb2, *rb3, *rb4, *rb5; - QRadioButton *rb6, *rb7, *rb8; - QRadioButton *rb9, *rb10, *rb11; + TQRadioButton *rb1, *rb2, *rb3, *rb4, *rb5; + TQRadioButton *rb6, *rb7, *rb8; + TQRadioButton *rb9, *rb10, *rb11; }; } // namespace KSpread diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc index 088c82f32..818581f60 100644 --- a/kspread/dialogs/kspread_dlg_styles.cc +++ b/kspread/dialogs/kspread_dlg_styles.cc @@ -18,9 +18,9 @@ * Boston, MA 02110-1301, USA. */ -#include <qheader.h> -#include <qlayout.h> -#include <qmap.h> +#include <tqheader.h> +#include <tqlayout.h> +#include <tqmap.h> #include <kcombobox.h> #include <kdebug.h> @@ -39,18 +39,18 @@ using namespace KSpread; -StyleWidget::StyleWidget( QWidget * parent, const char * name, WFlags fl ) - : QWidget( parent, name, fl ) +StyleWidget::StyleWidget( TQWidget * tqparent, const char * name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { - QVBoxLayout * layout = new QVBoxLayout( this, 11, 6, "layout"); + TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 11, 6, "tqlayout"); m_styleList = new KListView( this, "m_styleList" ); m_styleList->addColumn( i18n( "Styles" ) ); m_styleList->setResizeMode( KListView::AllColumns ); - layout->addWidget( m_styleList ); + tqlayout->addWidget( m_styleList ); m_displayBox = new KComboBox( FALSE, this, "m_displayBox" ); - layout->addWidget( m_displayBox ); + tqlayout->addWidget( m_displayBox ); m_styleList->header()->setLabel( 0, i18n( "Styles" ) ); m_displayBox->clear(); @@ -58,8 +58,8 @@ StyleWidget::StyleWidget( QWidget * parent, const char * name, WFlags fl ) m_displayBox->insertItem( i18n( "Applied Styles" ) ); m_displayBox->insertItem( i18n( "Custom Styles" ) ); m_displayBox->insertItem( i18n( "Hierarchical" ) ); - connect( m_styleList, SIGNAL(doubleClicked ( QListViewItem *)),this, SIGNAL( modifyStyle())); - resize( QSize(446, 384).expandedTo(minimumSizeHint()) ); + connect( m_styleList, TQT_SIGNAL(doubleClicked ( TQListViewItem *)),this, TQT_SIGNAL( modifyStyle())); + resize( TQSize(446, 384).expandedTo(tqminimumSizeHint()) ); } StyleWidget::~StyleWidget() @@ -68,17 +68,17 @@ StyleWidget::~StyleWidget() -StyleDlg::StyleDlg( View * parent, StyleManager * manager, +StyleDlg::StyleDlg( View * tqparent, StyleManager * manager, const char * name ) - : KDialogBase( parent, name, true, "", + : KDialogBase( tqparent, name, true, "", KDialogBase::Ok | KDialogBase::User1 | KDialogBase::User2 | KDialogBase::User3 | KDialogBase::Close, KDialogBase::Ok, false, KGuiItem( i18n( "&New..." ) ), KGuiItem( i18n( "&Modify..." ) ), KGuiItem( i18n( "&Delete" ) ) ), - m_view( parent ), + m_view( tqparent ), m_styleManager( manager ), m_dlg( new StyleWidget( this ) ) { setCaption( i18n( "Style Manager" ) ); - setButtonBoxOrientation( Vertical ); + setButtonBoxOrientation(Qt::Vertical ); setMainWidget( m_dlg ); slotDisplayMode( 0 ); @@ -86,11 +86,11 @@ StyleDlg::StyleDlg( View * parent, StyleManager * manager, enableButton( KDialogBase::User2, true ); enableButton( KDialogBase::User3, false ); - connect( m_dlg->m_styleList, SIGNAL( selectionChanged( QListViewItem * ) ), - this, SLOT( slotSelectionChanged( QListViewItem * ) ) ); - connect( m_dlg->m_displayBox, SIGNAL( activated( int ) ), this, SLOT( slotDisplayMode( int ) ) ); - connect( this, SIGNAL( user3Clicked() ), this, SLOT( slotUser3() ) ); - connect( m_dlg, SIGNAL( modifyStyle() ), this, SLOT( slotUser2())); + connect( m_dlg->m_styleList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + connect( m_dlg->m_displayBox, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotDisplayMode( int ) ) ); + connect( this, TQT_SIGNAL( user3Clicked() ), this, TQT_SLOT( slotUser3() ) ); + connect( m_dlg, TQT_SIGNAL( modifyStyle() ), this, TQT_SLOT( slotUser2())); } StyleDlg::~StyleDlg() @@ -99,7 +99,7 @@ StyleDlg::~StyleDlg() void StyleDlg::fillComboBox() { - class Map : public QMap<CustomStyle *, KListViewItem *> {}; + class Map : public TQMap<CustomStyle *, KListViewItem *> {}; Map entries; entries.clear(); @@ -111,13 +111,13 @@ void StyleDlg::fillComboBox() while ( entries.count() != count ) { - if ( entries.find( iter.data() ) == entries.end() ) + if ( entries.tqfind( iter.data() ) == entries.end() ) { - if ( iter.data()->parent() == 0 ) + if ( iter.data()->tqparent() == 0 ) entries[iter.data()] = new KListViewItem( m_dlg->m_styleList, iter.data()->name() ); else { - Map::const_iterator i = entries.find( iter.data()->parent() ); + Map::const_iterator i = entries.tqfind( iter.data()->tqparent() ); if ( i != entries.end() ) entries[iter.data()] = new KListViewItem( i.data(), iter.data()->name() ); } @@ -187,7 +187,7 @@ void StyleDlg::slotOk() CustomStyle * s = 0; - QString name( item->text( 0 ) ); + TQString name( item->text( 0 ) ); if ( name == i18n( "Default" ) ) s = m_styleManager->defaultStyle(); else @@ -222,7 +222,7 @@ void StyleDlg::slotUser1() if ( item ) { - QString name( item->text( 0 ) ); + TQString name( item->text( 0 ) ); if ( name == i18n( "Default" ) ) s = m_styleManager->defaultStyle(); else @@ -232,11 +232,11 @@ void StyleDlg::slotUser1() s = m_styleManager->defaultStyle(); int i = 1; - QString newName( i18n( "style%1" ).arg( m_styleManager->count() + i ) ); + TQString newName( i18n( "style%1" ).tqarg( m_styleManager->count() + i ) ); while ( m_styleManager->style( newName ) != 0 ) { ++i; - newName = i18n( "style%1" ).arg( m_styleManager->count() + i ); + newName = i18n( "style%1" ).tqarg( m_styleManager->count() + i ); } CustomStyle * style = new CustomStyle( newName, s ); @@ -264,7 +264,7 @@ void StyleDlg::slotUser2() CustomStyle * s = 0; - QString name( item->text( 0 ) ); + TQString name( item->text( 0 ) ); if ( name == i18n( "Default" ) ) s = m_styleManager->defaultStyle(); else @@ -286,7 +286,7 @@ void StyleDlg::slotUser3() CustomStyle * s = 0; - QString name( item->text( 0 ) ); + TQString name( item->text( 0 ) ); if ( name == i18n( "Default" ) ) s = m_styleManager->defaultStyle(); else @@ -304,13 +304,13 @@ void StyleDlg::slotUser3() slotDisplayMode( m_dlg->m_displayBox->currentItem() ); } -void StyleDlg::slotSelectionChanged( QListViewItem * item ) +void StyleDlg::slotSelectionChanged( TQListViewItem * item ) { if ( !item ) return; CustomStyle* style = 0; - QString name( item->text( 0 ) ); + TQString name( item->text( 0 ) ); if ( name == i18n( "Default" ) ) style = m_styleManager->defaultStyle(); else diff --git a/kspread/dialogs/kspread_dlg_styles.h b/kspread/dialogs/kspread_dlg_styles.h index 15ff4d4b8..5a87dcffa 100644 --- a/kspread/dialogs/kspread_dlg_styles.h +++ b/kspread/dialogs/kspread_dlg_styles.h @@ -22,24 +22,25 @@ #define __kspread_dlg_styles__ #include <kdialogbase.h> -#include <qwidget.h> +#include <tqwidget.h> class KComboBox; class KListView; -class QListViewItem; +class TQListViewItem; namespace KSpread { class StyleManager; class View; -class StyleWidget : public QWidget +class StyleWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - StyleWidget( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + StyleWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~StyleWidget(); KListView * m_styleList; @@ -51,8 +52,9 @@ signals: class StyleDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - StyleDlg( View * parent, StyleManager * manager, + StyleDlg( View * tqparent, StyleManager * manager, const char * name = "StyleDlg" ); ~StyleDlg(); @@ -62,7 +64,7 @@ class StyleDlg : public KDialogBase void slotUser2(); void slotUser3(); void slotDisplayMode( int mode ); - void slotSelectionChanged( QListViewItem * ); + void slotSelectionChanged( TQListViewItem * ); private: View * m_view; diff --git a/kspread/dialogs/kspread_dlg_subtotal.cc b/kspread/dialogs/kspread_dlg_subtotal.cc index f64664b52..696821cbe 100644 --- a/kspread/dialogs/kspread_dlg_subtotal.cc +++ b/kspread/dialogs/kspread_dlg_subtotal.cc @@ -19,10 +19,10 @@ * Boston, MA 02110-1301, USA. */ -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlistview.h> -#include <qmemarray.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlistview.h> +#include <tqmemarray.h> #include <kdebug.h> #include <klocale.h> @@ -38,14 +38,14 @@ using namespace KSpread; -SubtotalDialog::SubtotalDialog( View * parent, QRect const & selection, const char * name ) - : KDialogBase(parent, name, true, i18n( "Subtotals" ), Ok | Cancel | User1, Ok, true, KGuiItem(i18n( "Remove All" )) ), - m_pView( parent ), +SubtotalDialog::SubtotalDialog( View * tqparent, TQRect const & selection, const char * name ) + : KDialogBase(tqparent, name, true, i18n( "Subtotals" ), Ok | Cancel | User1, Ok, true, KGuiItem(i18n( "Remove All" )) ), + m_pView( tqparent ), m_pSheet( m_pView->activeSheet() ), m_selection( selection ), m_dialog( new Subtotal( this ) ) { - setButtonBoxOrientation( Vertical ); + setButtonBoxOrientation( Qt::Vertical ); setMainWidget( m_dialog ); fillColumnBoxes(); @@ -59,14 +59,14 @@ SubtotalDialog::~SubtotalDialog() void SubtotalDialog::slotOk() { int numOfCols = m_selection.width(); - QMemArray<int> columns( numOfCols ); + TQMemArray<int> columns( numOfCols ); int n = 0; bool empty = true; int left = m_selection.left(); - for ( QListViewItem * item = m_dialog->m_columnList->firstChild(); item; item = item->nextSibling() ) + for ( TQListViewItem * item = m_dialog->m_columnList->firstChild(); item; item = item->nextSibling() ) { - if ( ((QCheckListItem * ) item)->isOn() ) + if ( ((TQCheckListItem * ) item)->isOn() ) { columns[n] = left + n; empty = false; @@ -89,9 +89,9 @@ void SubtotalDialog::slotOk() int bottom = m_selection.bottom(); int top = m_selection.top(); left = m_selection.left(); - QString oldText = m_pSheet->cellAt( mainCol, top )->strOutText(); - QString newText; - QString result( " " + i18n("Result") ); + TQString oldText = m_pSheet->cellAt( mainCol, top )->strOutText(); + TQString newText; + TQString result( " " + i18n("Result") ); int lastChangedRow = top; m_pView->doc()->emitBeginOperation( false ); @@ -193,7 +193,7 @@ void SubtotalDialog::removeSubtotalLines() int t = m_selection.top(); Cell * cell; - QString text; + TQString text; for ( int y = m_selection.bottom(); y >= t; --y ) { @@ -206,7 +206,7 @@ void SubtotalDialog::removeSubtotalLines() continue; text = cell->text(); - if ( text.find( "SUBTOTAL" ) != -1 ) + if ( text.tqfind( "SUBTOTAL" ) != -1 ) { containsSubtotal = true; break; @@ -216,7 +216,7 @@ void SubtotalDialog::removeSubtotalLines() if ( containsSubtotal ) { kdDebug() << "Line " << y << " contains a subtotal " << endl; - QRect rect( l, y, m_selection.width(), 1 ); + TQRect rect( l, y, m_selection.width(), 1 ); m_pSheet->unshiftColumn( rect ); m_selection.setHeight( m_selection.height() - 1 ); @@ -231,10 +231,10 @@ void SubtotalDialog::fillColumnBoxes() int row = m_selection.top(); Cell * cell; - QCheckListItem * item; + TQCheckListItem * item; - QString text; - QString col( i18n( "Column '%1' ") ); + TQString text; + TQString col( i18n( "Column '%1' ") ); for ( int i = m_selection.left(); i <= r; ++i ) { @@ -243,14 +243,14 @@ void SubtotalDialog::fillColumnBoxes() if ( text.length() > 0 ) { - text = col.arg( Cell::columnName( i ) ); + text = col.tqarg( Cell::columnName( i ) ); } m_dialog->m_columnBox->insertItem( text ); - item = new QCheckListItem( m_dialog->m_columnList, + item = new TQCheckListItem( m_dialog->m_columnList, text, - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); item->setOn(false); m_dialog->m_columnList->insertItem( item ); } @@ -258,7 +258,7 @@ void SubtotalDialog::fillColumnBoxes() void SubtotalDialog::fillFunctionBox() { - QStringList lst; + TQStringList lst; lst << i18n( "Average" ); lst << i18n( "Count" ); lst << i18n( "CountA" ); @@ -274,13 +274,13 @@ void SubtotalDialog::fillFunctionBox() } bool SubtotalDialog::addSubtotal( int mainCol, int column, int row, int topRow, - bool addRow, QString const & text ) + bool addRow, TQString const & text ) { kdDebug() << "Adding subtotal: " << mainCol << ", " << column << ", Rows: " << row << ", " << topRow << ": addRow: " << addRow << ", Text: " << text << endl; if ( addRow ) { - QRect rect(m_selection.left(), row + 1, m_selection.width(), 1); + TQRect rect(m_selection.left(), row + 1, m_selection.width(), 1); if ( !m_pSheet->shiftColumn( rect ) ) return false; @@ -293,18 +293,18 @@ bool SubtotalDialog::addSubtotal( int mainCol, int column, int row, int topRow, cell->format()->setTextFontUnderline( true ); } - QString colName = Cell::columnName( column ); + TQString colName = Cell::columnName( column ); - QString formula("=SUBTOTAL("); - formula += QString::number( m_dialog->m_functionBox->currentItem() + 1 ); + TQString formula("=SUBTOTAL("); + formula += TQString::number( m_dialog->m_functionBox->currentItem() + 1 ); formula += "; "; formula += colName; - formula += QString::number( topRow ); + formula += TQString::number( topRow ); // if ( topRow != row ) { formula += ":"; formula += colName; - formula += QString::number( row ); + formula += TQString::number( row ); } formula += ")"; diff --git a/kspread/dialogs/kspread_dlg_subtotal.h b/kspread/dialogs/kspread_dlg_subtotal.h index 8bb2f3fbe..230560a5a 100644 --- a/kspread/dialogs/kspread_dlg_subtotal.h +++ b/kspread/dialogs/kspread_dlg_subtotal.h @@ -25,10 +25,10 @@ #include <kdialogbase.h> -#include <qpoint.h> -#include <qrect.h> +#include <tqpoint.h> +#include <tqrect.h> -class QLineEdit; +class TQLineEdit; namespace KSpread { @@ -39,13 +39,14 @@ class View; class SubtotalDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SubtotalDialog( View * parent, QRect const & selection, + SubtotalDialog( View * tqparent, TQRect const & selection, const char * name ); ~SubtotalDialog(); - QRect const & selection() const { return m_selection; } + TQRect const & selection() const { return m_selection; } Sheet * sheet() const { return m_pSheet; } private slots: @@ -56,14 +57,14 @@ class SubtotalDialog : public KDialogBase private: View * m_pView; Sheet * m_pSheet; - QRect m_selection; + TQRect m_selection; Subtotal * m_dialog; void fillColumnBoxes(); void fillFunctionBox(); void removeSubtotalLines(); bool addSubtotal( int mainCol, int column, int row, int topRow, - bool addRow, QString const & text ); + bool addRow, TQString const & text ); }; } // namespace KSpread diff --git a/kspread/dialogs/kspread_dlg_validity.cc b/kspread/dialogs/kspread_dlg_validity.cc index f40b6caa1..885d06f78 100644 --- a/kspread/dialogs/kspread_dlg_validity.cc +++ b/kspread/dialogs/kspread_dlg_validity.cc @@ -28,43 +28,43 @@ #include "kspread_sheet.h" #include "kspread_view.h" -#include <qlayout.h> -#include <qbuttongroup.h> +#include <tqlayout.h> +#include <tqbuttongroup.h> #include <knumvalidator.h> #include <kdebug.h> #include <kmessagebox.h> -#include <qcombobox.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qtextedit.h> -#include <qcheckbox.h> +#include <tqcombobox.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqtextedit.h> +#include <tqcheckbox.h> using namespace KSpread; -DlgValidity::DlgValidity(View* parent,const char* name , const QRect &_marker ) - :KDialogBase(KDialogBase::Tabbed, i18n("Validity"),User2|User1|Cancel, User1, parent, name,true,false,KStdGuiItem::ok(),i18n("Clear &All")) +DlgValidity::DlgValidity(View* tqparent,const char* name , const TQRect &_marker ) + :KDialogBase(KDialogBase::Tabbed, i18n("Validity"),User2|User1|Cancel, User1, tqparent, name,true,false,KStdGuiItem::ok(),i18n("Clear &All")) { - m_pView=parent; + m_pView=tqparent; marker=_marker; - QFrame *page1 = addPage(i18n("&Values")); - QVBoxLayout *lay1 = new QVBoxLayout( page1, KDialogBase::marginHint(), KDialogBase::spacingHint() ); + TQFrame *page1 = addPage(i18n("&Values")); + TQVBoxLayout *lay1 = new TQVBoxLayout( page1, KDialogBase::marginHint(), KDialogBase::spacingHint() ); - QGroupBox* tmpQButtonGroup; - tmpQButtonGroup = new QGroupBox( 0, Qt::Vertical, i18n("Validity Criteria"), page1, "ButtonGroup_1" ); - tmpQButtonGroup->layout()->setSpacing(KDialog::spacingHint()); - tmpQButtonGroup->layout()->setMargin(KDialog::marginHint()); - QGridLayout *grid1 = new QGridLayout(tmpQButtonGroup->layout(),4,2); + TQGroupBox* tmpTQButtonGroup; + tmpTQButtonGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Validity Criteria"), page1, "ButtonGroup_1" ); + tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint()); + tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint()); + TQGridLayout *grid1 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),4,2); - QLabel *tmpQLabel = new QLabel( tmpQButtonGroup, "Label_1" ); - tmpQLabel->setText(i18n("Allow:" )); - grid1->addWidget(tmpQLabel,0,0); + TQLabel *tmpTQLabel = new TQLabel( tmpTQButtonGroup, "Label_1" ); + tmpTQLabel->setText(i18n("Allow:" )); + grid1->addWidget(tmpTQLabel,0,0); - chooseType=new QComboBox(tmpQButtonGroup); + chooseType=new TQComboBox(tmpTQButtonGroup); grid1->addWidget(chooseType,0,1); - QStringList listType; + TQStringList listType; listType+=i18n("All"); listType+=i18n("Number"); listType+=i18n("Integer"); @@ -76,16 +76,16 @@ DlgValidity::DlgValidity(View* parent,const char* name , const QRect &_marker ) chooseType->insertStringList(listType); chooseType->setCurrentItem(0); - allowEmptyCell = new QCheckBox( i18n( "Allow blanks" ), tmpQButtonGroup ); + allowEmptyCell = new TQCheckBox( i18n( "Allow blanks" ), tmpTQButtonGroup ); grid1->addWidget(allowEmptyCell,1,0); - tmpQLabel = new QLabel( tmpQButtonGroup, "Label_2" ); - tmpQLabel->setText(i18n("Data:" )); - grid1->addWidget(tmpQLabel,2,0); + tmpTQLabel = new TQLabel( tmpTQButtonGroup, "Label_2" ); + tmpTQLabel->setText(i18n("Data:" )); + grid1->addWidget(tmpTQLabel,2,0); - choose=new QComboBox(tmpQButtonGroup); + choose=new TQComboBox(tmpTQButtonGroup); grid1->addWidget(choose,2,1); - QStringList list; + TQStringList list; list+=i18n("equal to"); list+=i18n("greater than"); list+=i18n("less than"); @@ -97,25 +97,25 @@ DlgValidity::DlgValidity(View* parent,const char* name , const QRect &_marker ) choose->insertStringList(list); choose->setCurrentItem(0); - edit1 = new QLabel( tmpQButtonGroup, "Label_3" ); + edit1 = new TQLabel( tmpTQButtonGroup, "Label_3" ); edit1->setText(i18n("Minimum:" )); grid1->addWidget(edit1,3,0); - val_min=new QLineEdit(tmpQButtonGroup); + val_min=new TQLineEdit(tmpTQButtonGroup); grid1->addWidget(val_min,3,1); val_min->setValidator( new KFloatValidator( val_min ) ); - edit2 = new QLabel( tmpQButtonGroup, "Label_4" ); + edit2 = new TQLabel( tmpTQButtonGroup, "Label_4" ); edit2->setText(i18n("Maximum:" )); grid1->addWidget(edit2,4,0); - val_max=new QLineEdit(tmpQButtonGroup); + val_max=new TQLineEdit(tmpTQButtonGroup); grid1->addWidget(val_max,4,1); val_max->setValidator( new KFloatValidator( val_max ) ); - lay1->addWidget(tmpQButtonGroup); + lay1->addWidget(tmpTQButtonGroup); //Apply minimum width of column1 to avoid horizontal move when changing option - //A bit ugly to apply text always, but I couldn't get a label->QFontMetrix.boundingRect("text").width() + //A bit ugly to apply text always, but I couldn't get a label->TQFontMetrix.boundingRect("text").width() //to give mew the correct results - Philipp edit2->setText( i18n( "Date:" ) ); grid1->addColSpacing( 0, edit2->width() ); @@ -136,88 +136,88 @@ DlgValidity::DlgValidity(View* parent,const char* name , const QRect &_marker ) edit2->setText( i18n( "Number:" ) ); grid1->addColSpacing( 0, edit2->width() ); - validityList = new QTextEdit( tmpQButtonGroup ); + validityList = new TQTextEdit( tmpTQButtonGroup ); grid1->addMultiCellWidget(validityList,2, 4,1, 1); - validityLabelList = new QLabel( tmpQButtonGroup, "Label_Label_List" ); + validityLabelList = new TQLabel( tmpTQButtonGroup, "Label_Label_List" ); validityLabelList->setText(i18n("Entries:" )); grid1->addWidget(validityLabelList,2,0); - QFrame *page2 = addPage(i18n("&Error Alert")); + TQFrame *page2 = addPage(i18n("&Error Alert")); - lay1 = new QVBoxLayout( page2, KDialogBase::marginHint(), KDialogBase::spacingHint() ); + lay1 = new TQVBoxLayout( page2, KDialogBase::marginHint(), KDialogBase::spacingHint() ); - tmpQButtonGroup = new QButtonGroup( 0, Qt::Vertical, i18n("Contents"), page2, "ButtonGroup_2" ); - tmpQButtonGroup->layout()->setSpacing(KDialog::spacingHint()); - tmpQButtonGroup->layout()->setMargin(KDialog::marginHint()); - QGridLayout *grid2 = new QGridLayout(tmpQButtonGroup->layout(),5,2); + tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page2, "ButtonGroup_2" ); + tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint()); + tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint()); + TQGridLayout *grid2 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),5,2); - displayMessage = new QCheckBox(i18n( "Show error message when invalid values are entered" ),tmpQButtonGroup ); + displayMessage = new TQCheckBox(i18n( "Show error message when invalid values are entered" ),tmpTQButtonGroup ); displayMessage->setChecked( true ); grid2->addMultiCellWidget(displayMessage,0, 0,0, 1); - tmpQLabel = new QLabel( tmpQButtonGroup, "Label_5" ); - tmpQLabel->setText(i18n("Action:" )); - grid2->addWidget(tmpQLabel,1,0); + tmpTQLabel = new TQLabel( tmpTQButtonGroup, "Label_5" ); + tmpTQLabel->setText(i18n("Action:" )); + grid2->addWidget(tmpTQLabel,1,0); - chooseAction=new QComboBox(tmpQButtonGroup); + chooseAction=new TQComboBox(tmpTQButtonGroup); grid2->addWidget(chooseAction,1,1); - QStringList list2; + TQStringList list2; list2+=i18n("Stop"); list2+=i18n("Warning"); list2+=i18n("Information"); chooseAction->insertStringList(list2); chooseAction->setCurrentItem(0); - tmpQLabel = new QLabel( tmpQButtonGroup, "Label_6" ); - tmpQLabel->setText(i18n("Title:" )); - grid2->addWidget(tmpQLabel,2,0); + tmpTQLabel = new TQLabel( tmpTQButtonGroup, "Label_6" ); + tmpTQLabel->setText(i18n("Title:" )); + grid2->addWidget(tmpTQLabel,2,0); - title=new QLineEdit( tmpQButtonGroup); + title=new TQLineEdit( tmpTQButtonGroup); grid2->addWidget(title,2,1); - tmpQLabel = new QLabel( tmpQButtonGroup, "Label_7" ); - tmpQLabel->setText(i18n("Message:" )); - grid2->addWidget(tmpQLabel,3,0); + tmpTQLabel = new TQLabel( tmpTQButtonGroup, "Label_7" ); + tmpTQLabel->setText(i18n("Message:" )); + grid2->addWidget(tmpTQLabel,3,0); - message =new QTextEdit( tmpQButtonGroup); + message =new TQTextEdit( tmpTQButtonGroup); grid2->addMultiCellWidget(message,3, 4,1, 1); - lay1->addWidget(tmpQButtonGroup); - message->setTextFormat( Qt::PlainText ); + lay1->addWidget(tmpTQButtonGroup); + message->setTextFormat( TQt::PlainText ); - QFrame *page3 = addPage(i18n("Input Help")); - lay1 = new QVBoxLayout( page3, KDialogBase::marginHint(), KDialogBase::spacingHint() ); + TQFrame *page3 = addPage(i18n("Input Help")); + lay1 = new TQVBoxLayout( page3, KDialogBase::marginHint(), KDialogBase::spacingHint() ); - tmpQButtonGroup = new QButtonGroup( 0, Qt::Vertical, i18n("Contents"), page3, "ButtonGroup_2" ); - tmpQButtonGroup->layout()->setSpacing(KDialog::spacingHint()); - tmpQButtonGroup->layout()->setMargin(KDialog::marginHint()); + tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page3, "ButtonGroup_2" ); + tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint()); + tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint()); - QGridLayout *grid3 = new QGridLayout(tmpQButtonGroup->layout(),5,2); + TQGridLayout *grid3 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),5,2); - displayHelp = new QCheckBox(i18n( "Show input help when cell is selected" ),tmpQButtonGroup ); + displayHelp = new TQCheckBox(i18n( "Show input help when cell is selected" ),tmpTQButtonGroup ); displayMessage->setChecked( false ); grid3->addMultiCellWidget(displayHelp,0, 0,0, 1); - tmpQLabel = new QLabel( tmpQButtonGroup, "Label_6" ); - tmpQLabel->setText(i18n("Title:" )); - grid3->addWidget(tmpQLabel,2,0); + tmpTQLabel = new TQLabel( tmpTQButtonGroup, "Label_6" ); + tmpTQLabel->setText(i18n("Title:" )); + grid3->addWidget(tmpTQLabel,2,0); - titleHelp=new QLineEdit( tmpQButtonGroup); + titleHelp=new TQLineEdit( tmpTQButtonGroup); grid3->addWidget(titleHelp,2,1); - tmpQLabel = new QLabel( tmpQButtonGroup, "Label_7" ); - tmpQLabel->setText(i18n("Message:" )); - grid3->addWidget(tmpQLabel,3,0); + tmpTQLabel = new TQLabel( tmpTQButtonGroup, "Label_7" ); + tmpTQLabel->setText(i18n("Message:" )); + grid3->addWidget(tmpTQLabel,3,0); - messageHelp =new QTextEdit( tmpQButtonGroup); + messageHelp =new TQTextEdit( tmpTQButtonGroup); grid3->addMultiCellWidget(messageHelp,3, 4,1, 1); - lay1->addWidget(tmpQButtonGroup); - messageHelp->setTextFormat( Qt::PlainText ); + lay1->addWidget(tmpTQButtonGroup); + messageHelp->setTextFormat( TQt::PlainText ); - connect(choose,SIGNAL(activated(int )),this,SLOT(changeIndexCond(int))); - connect(chooseType,SIGNAL(activated(int )),this,SLOT(changeIndexType(int))); - connect( this, SIGNAL(user1Clicked()), SLOT(OkPressed()) ); - connect( this, SIGNAL(user2Clicked()), SLOT(clearAllPressed()) ); + connect(choose,TQT_SIGNAL(activated(int )),this,TQT_SLOT(changeIndexCond(int))); + connect(chooseType,TQT_SIGNAL(activated(int )),this,TQT_SLOT(changeIndexType(int))); + connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(OkPressed()) ); + connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(clearAllPressed()) ); init(); } @@ -367,8 +367,8 @@ void DlgValidity::changeIndexType(int _index) } break; } - if ( width() < sizeHint().width() ) - resize( sizeHint() ); + if ( width() < tqsizeHint().width() ) + resize( tqsizeHint() ); } void DlgValidity::changeIndexCond(int _index) @@ -431,7 +431,7 @@ void DlgValidity::init() { message->setText(tmpValidity->message); title->setText(tmpValidity->title); - QString tmp; + TQString tmp; switch( tmpValidity->m_restriction) { case Restriction::None: @@ -473,9 +473,9 @@ void DlgValidity::init() case Restriction::List: { chooseType->setCurrentItem(7); - QStringList lst =tmpValidity->listValidity; - QString tmp; - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { + TQStringList lst =tmpValidity->listValidity; + TQString tmp; + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { tmp +=( *it )+"\n"; } validityList->setText( tmp ); @@ -641,10 +641,10 @@ void DlgValidity::OkPressed() result.title=title->text(); result.valMin=0; result.valMax=0; - result.timeMin=QTime(0,0,0); - result.timeMax=QTime(0,0,0); - result.dateMin=QDate(0,0,0); - result.dateMax=QDate(0,0,0); + result.timeMin=TQTime(0,0,0); + result.timeMax=TQTime(0,0,0); + result.dateMin=TQDate(0,0,0); + result.dateMax=TQDate(0,0,0); } else { @@ -725,10 +725,10 @@ void DlgValidity::OkPressed() result.title=title->text(); result.valMin=0; result.valMax=0; - result.timeMin=QTime(0,0,0); - result.timeMax=QTime(0,0,0); - result.dateMin=QDate(0,0,0); - result.dateMax=QDate(0,0,0); + result.timeMin=TQTime(0,0,0); + result.timeMax=TQTime(0,0,0); + result.dateMin=TQDate(0,0,0); + result.dateMax=TQDate(0,0,0); if( chooseType->currentItem()==1) { @@ -738,8 +738,8 @@ void DlgValidity::OkPressed() } else { - result.valMin=QMIN(val_min->text().toDouble(),val_max->text().toDouble()); - result.valMax=QMAX(val_max->text().toDouble(),val_min->text().toDouble()); + result.valMin=TQMIN(val_min->text().toDouble(),val_max->text().toDouble()); + result.valMax=TQMAX(val_max->text().toDouble(),val_min->text().toDouble()); } } else if( chooseType->currentItem()==2 || chooseType->currentItem()==6) @@ -750,8 +750,8 @@ void DlgValidity::OkPressed() } else { - result.valMin=QMIN(val_min->text().toInt(),val_max->text().toInt()); - result.valMax=QMAX(val_max->text().toInt(),val_min->text().toInt()); + result.valMin=TQMIN(val_min->text().toInt(),val_max->text().toInt()); + result.valMax=TQMAX(val_max->text().toInt(),val_min->text().toInt()); } } else if( chooseType->currentItem()==4) @@ -796,7 +796,7 @@ void DlgValidity::OkPressed() } else if ( chooseType->currentItem()==7 ) { - result.listValidity=QStringList::split( "\n", validityList->text() ); + result.listValidity=TQStringList::split( "\n", validityList->text() ); } } result.displayMessage = displayMessage->isChecked(); diff --git a/kspread/dialogs/kspread_dlg_validity.h b/kspread/dialogs/kspread_dlg_validity.h index 4bf96bbe9..b9546cac8 100644 --- a/kspread/dialogs/kspread_dlg_validity.h +++ b/kspread/dialogs/kspread_dlg_validity.h @@ -28,12 +28,12 @@ #include "kspread_cell.h" -class QLabel; -class QLineEdit; -class QTextEdit; -class QComboBox; -class QPushButton; -class QCheckBox; +class TQLabel; +class TQLineEdit; +class TQTextEdit; +class TQComboBox; +class TQPushButton; +class TQCheckBox; namespace KSpread { @@ -43,8 +43,9 @@ class View; class DlgValidity : public KDialogBase { Q_OBJECT + TQ_OBJECT public: -DlgValidity(View* parent, const char* name ,const QRect &_marker ); +DlgValidity(View* tqparent, const char* name ,const TQRect &_marker ); void init(); public slots: @@ -56,24 +57,24 @@ protected: void displayOrNotListOfValidity( bool _displayList); View* m_pView; - QRect marker; - QLineEdit *val_max; - QLineEdit *val_min; - QLabel *edit1; - QLabel *edit2; - QComboBox *choose; - QComboBox *chooseAction; - QComboBox *chooseType; - QLineEdit * title; - QTextEdit *message; + TQRect marker; + TQLineEdit *val_max; + TQLineEdit *val_min; + TQLabel *edit1; + TQLabel *edit2; + TQComboBox *choose; + TQComboBox *chooseAction; + TQComboBox *chooseType; + TQLineEdit * title; + TQTextEdit *message; Validity result; - QCheckBox *displayMessage; - QCheckBox *allowEmptyCell; - QCheckBox *displayHelp; - QTextEdit *messageHelp; - QLineEdit *titleHelp; - QTextEdit *validityList; - QLabel *validityLabelList; + TQCheckBox *displayMessage; + TQCheckBox *allowEmptyCell; + TQCheckBox *displayHelp; + TQTextEdit *messageHelp; + TQLineEdit *titleHelp; + TQTextEdit *validityList; + TQLabel *validityLabelList; }; } // namespace KSpread diff --git a/kspread/dialogs/kspreadsubtotal.ui b/kspread/dialogs/kspreadsubtotal.ui index a5da5c42c..9cfb871a5 100644 --- a/kspread/dialogs/kspreadsubtotal.ui +++ b/kspread/dialogs/kspreadsubtotal.ui @@ -18,7 +18,7 @@ License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</comment> <author>Norbert Andres <nandres@web.de></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSpreadSubtotal</cstring> </property> @@ -43,7 +43,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>TabWidget2</cstring> </property> @@ -55,7 +55,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -72,12 +72,12 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <property name="spacing"> <number>6</number> </property> - <widget class="QComboBox" row="3" column="0"> + <widget class="TQComboBox" row="3" column="0"> <property name="name"> <cstring>m_functionBox</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>m_addSubtotalToLabel</cstring> </property> @@ -85,7 +85,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <string>Add Subtotal to:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>m_useFunctionLabel</cstring> </property> @@ -93,12 +93,12 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <string>Use function:</string> </property> </widget> - <widget class="QComboBox" row="1" column="0"> + <widget class="TQComboBox" row="1" column="0"> <property name="name"> <cstring>m_columnBox</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_eachChangeLabel</cstring> </property> @@ -106,7 +106,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <string>At each change in:</string> </property> </widget> - <widget class="QListView" row="5" column="0"> + <widget class="TQListView" row="5" column="0"> <column> <property name="text"> <string>Columns</string> @@ -124,7 +124,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -141,7 +141,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_replaceSubtotals</cstring> </property> @@ -152,7 +152,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>m_pageBreak</cstring> </property> @@ -163,7 +163,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <string>&Page break between groups</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>m_summaryBelow</cstring> </property> @@ -177,7 +177,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>m_summaryOnly</cstring> </property> @@ -195,14 +195,14 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>152</height> </size> </property> </spacer> - <widget class="QCheckBox" row="4" column="0"> + <widget class="TQCheckBox" row="4" column="0"> <property name="name"> <cstring>m_IgnoreBox</cstring> </property> @@ -218,5 +218,5 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc index 7704eee5a..0e115e01a 100644 --- a/kspread/dialogs/link.cc +++ b/kspread/dialogs/link.cc @@ -24,10 +24,10 @@ #include "link.h" -#include <qcombobox.h> -#include <qframe.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqcombobox.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <kdesktopfile.h> #include <kdialogbase.h> @@ -43,22 +43,22 @@ using namespace KSpread; class LinkDialog::Private { public: - QString text; - QFrame* internetPage; + TQString text; + TQFrame* internetPage; KLineEdit* internetText; KLineEdit* internetLink; - QFrame* mailPage; + TQFrame* mailPage; KLineEdit* mailText; KLineEdit* mailLink; - QFrame* filePage; + TQFrame* filePage; KLineEdit* fileText; KURLRequester* fileLink; - QFrame* cellPage; + TQFrame* cellPage; KLineEdit* cellText; KLineEdit* cellLink; }; -LinkDialog::LinkDialog( QWidget*, const char* ) +LinkDialog::LinkDialog( TQWidget*, const char* ) : KDialogBase( KDialogBase::IconList,i18n( "Insert Link") , KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok ) @@ -66,57 +66,57 @@ LinkDialog::LinkDialog( QWidget*, const char* ) d = new Private; // link for web or ftp - d->internetPage = addPage( i18n( "Internet" ), QString::null, + d->internetPage = addPage( i18n( "Internet" ), TQString(), BarIcon( "html",KIcon::SizeMedium ) ); - QVBoxLayout* iLayout = new QVBoxLayout( d->internetPage, marginHint(), spacingHint() ); - iLayout->add( new QLabel( i18n("Text to display:" ), d->internetPage ) ); + TQVBoxLayout* iLayout = new TQVBoxLayout( d->internetPage, marginHint(), spacingHint() ); + iLayout->add( new TQLabel( i18n("Text to display:" ), d->internetPage ) ); d->internetText = new KLineEdit( d->internetPage ); iLayout->add( d->internetText ); - iLayout->add( new QLabel( i18n("Internet address:" ), d->internetPage ) ); + iLayout->add( new TQLabel( i18n("Internet address:" ), d->internetPage ) ); d->internetLink = new KLineEdit( d->internetPage ); iLayout->add( d->internetLink ); - iLayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); - connect( d->internetText, SIGNAL( textChanged( const QString& ) ), this, - SLOT( setText( const QString& ) ) ); + iLayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); + connect( d->internetText, TQT_SIGNAL( textChanged( const TQString& ) ), this, + TQT_SLOT( setText( const TQString& ) ) ); // link for e-mail - d->mailPage = addPage( i18n( "Mail" ), QString::null, + d->mailPage = addPage( i18n( "Mail" ), TQString(), BarIcon( "mail_generic",KIcon::SizeMedium ) ); - QVBoxLayout* mLayout = new QVBoxLayout( d->mailPage, marginHint(), spacingHint() ); - mLayout->add( new QLabel( i18n("Text to display:" ), d->mailPage ) ); + TQVBoxLayout* mLayout = new TQVBoxLayout( d->mailPage, marginHint(), spacingHint() ); + mLayout->add( new TQLabel( i18n("Text to display:" ), d->mailPage ) ); d->mailText = new KLineEdit( d->mailPage ); mLayout->add( d->mailText ); - mLayout->add( new QLabel( i18n("Email:" ), d->mailPage ) ); + mLayout->add( new TQLabel( i18n("Email:" ), d->mailPage ) ); d->mailLink = new KLineEdit( d->mailPage ); mLayout->add( d->mailLink ); - mLayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); - connect( d->mailText, SIGNAL( textChanged( const QString& ) ), this, - SLOT( setText( const QString& ) ) ); + mLayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); + connect( d->mailText, TQT_SIGNAL( textChanged( const TQString& ) ), this, + TQT_SLOT( setText( const TQString& ) ) ); // link for external file - d->filePage = addPage( i18n( "File" ), QString::null, + d->filePage = addPage( i18n( "File" ), TQString(), BarIcon( "filenew",KIcon::SizeMedium ) ); - QVBoxLayout* fLayout = new QVBoxLayout( d->filePage, marginHint(), spacingHint() ); - fLayout->add( new QLabel( i18n("Text to display:" ), d->filePage ) ); + TQVBoxLayout* fLayout = new TQVBoxLayout( d->filePage, marginHint(), spacingHint() ); + fLayout->add( new TQLabel( i18n("Text to display:" ), d->filePage ) ); d->fileText = new KLineEdit( d->filePage ); fLayout->add( d->fileText ); - fLayout->add( new QLabel( i18n("File location:" ), d->filePage ) ); + fLayout->add( new TQLabel( i18n("File location:" ), d->filePage ) ); d->fileLink = new KURLRequester( d->filePage ); fLayout->add( d->fileLink ); - fLayout->add( new QLabel( i18n("Recent file:" ), d->filePage ) ); - QComboBox* recentFile = new QComboBox( d->filePage ); - recentFile->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); + fLayout->add( new TQLabel( i18n("Recent file:" ), d->filePage ) ); + TQComboBox* recentFile = new TQComboBox( d->filePage ); + recentFile->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); fLayout->add( recentFile ); - fLayout->addItem( new QSpacerItem( 0, 40, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding ) ); - connect( d->fileText, SIGNAL( textChanged( const QString& ) ), this, - SLOT( setText( const QString& ) ) ); - QObject::connect( recentFile, SIGNAL( highlighted ( const QString &) ), - d->fileLink->lineEdit(), SLOT( setText( const QString & ) ) ); + fLayout->addItem( new TQSpacerItem( 0, 40, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) ); + connect( d->fileText, TQT_SIGNAL( textChanged( const TQString& ) ), this, + TQT_SLOT( setText( const TQString& ) ) ); + TQObject::connect( recentFile, TQT_SIGNAL( highlighted ( const TQString &) ), + d->fileLink->lineEdit(), TQT_SLOT( setText( const TQString & ) ) ); // populate recent files - QStringList fileList = KRecentDocument::recentDocuments(); - for( QStringList::ConstIterator it = fileList.begin();it != fileList.end(); ++it ) + TQStringList fileList = KRecentDocument::recentDocuments(); + for( TQStringList::ConstIterator it = fileList.begin();it != fileList.end(); ++it ) { KDesktopFile f(*it, true /* read only */); if ( !f.readURL().isEmpty() ) @@ -129,18 +129,18 @@ LinkDialog::LinkDialog( QWidget*, const char* ) } // link to another cell - d->cellPage = addPage( i18n( "Cell" ), QString::null, + d->cellPage = addPage( i18n( "Cell" ), TQString(), BarIcon( "misc",KIcon::SizeMedium ) ); - QVBoxLayout* cLayout = new QVBoxLayout( d->cellPage, marginHint(), spacingHint() ); - cLayout->add( new QLabel( i18n("Text to display:" ), d->cellPage ) ); + TQVBoxLayout* cLayout = new TQVBoxLayout( d->cellPage, marginHint(), spacingHint() ); + cLayout->add( new TQLabel( i18n("Text to display:" ), d->cellPage ) ); d->cellText = new KLineEdit( d->cellPage ); cLayout->add( d->cellText ); - cLayout->add( new QLabel( i18n("Cell:" ), d->cellPage ) ); + cLayout->add( new TQLabel( i18n("Cell:" ), d->cellPage ) ); d->cellLink = new KLineEdit( d->cellPage ); cLayout->add( d->cellLink ); - cLayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); - connect( d->cellText, SIGNAL( textChanged( const QString& ) ), this, - SLOT( setText( const QString& ) ) ); + cLayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); + connect( d->cellText, TQT_SIGNAL( textChanged( const TQString& ) ), this, + TQT_SLOT( setText( const TQString& ) ) ); enableButtonSeparator( true ); d->internetText->setFocus(); @@ -152,36 +152,36 @@ LinkDialog::~LinkDialog() delete d; } -QString LinkDialog::text() const +TQString LinkDialog::text() const { return d->text; } -QString LinkDialog::link() const +TQString LinkDialog::link() const { - QString str; + TQString str; switch( activePageIndex() ) { case 0: str = d->internetLink->text(); if( !str.isEmpty() ) - if( str.find( "http://" )==-1 ) - if( str.find( "https://" )==-1 ) - if( str.find( "ftp://" )==-1 ) + if( str.tqfind( "http://" )==-1 ) + if( str.tqfind( "https://" )==-1 ) + if( str.tqfind( "ftp://" )==-1 ) str.prepend( "http://" ); break; case 1: str = d->mailLink->text(); if( !str.isEmpty() ) - if( str.find( "mailto:" )==-1 ) + if( str.tqfind( "mailto:" )==-1 ) str.prepend( "mailto:" ); break; case 2: str = d->fileLink->lineEdit()->text(); if( !str.isEmpty() ) - if( str.find( "file:/" )==-1 ) + if( str.tqfind( "file:/" )==-1 ) str.prepend( "file://" ); break; @@ -194,7 +194,7 @@ QString LinkDialog::link() const return str; } -void LinkDialog::setText( const QString& text ) +void LinkDialog::setText( const TQString& text ) { d->text = text; @@ -217,39 +217,39 @@ void LinkDialog::setText( const QString& text ) // link must be complete, e.g. "http://www.koffice.org" instead of // "www.koffice.org" only, since protocol is used to decide which page to show -void LinkDialog::setLink( const QString& link ) +void LinkDialog::setLink( const TQString& link ) { if( link.startsWith( "https://" ) ) { - d->internetLink->setText( link.mid( QString("https://").length() ) ); + d->internetLink->setText( link.mid( TQString("https://").length() ) ); showPage( 0 ); return; } if( link.startsWith( "http://" ) ) { - d->internetLink->setText( link.mid( QString("http://").length() ) ); + d->internetLink->setText( link.mid( TQString("http://").length() ) ); showPage( 0 ); return; } if( link.startsWith( "ftp://" ) ) { - d->internetLink->setText( link.mid( QString("ftp://").length() ) ); + d->internetLink->setText( link.mid( TQString("ftp://").length() ) ); showPage( 0 ); return; } if( link.startsWith( "mailto:" ) ) { - d->mailLink->setText( link.mid( QString("mailto:").length() ) ); + d->mailLink->setText( link.mid( TQString("mailto:").length() ) ); showPage( 1 ); return; } if( link.startsWith( "file:/" ) ) { - QString s = link.mid( QString("file:/").length() ); + TQString s = link.mid( TQString("file:/").length() ); while(s.startsWith("//")) s.remove(0,1); d->fileLink->lineEdit()->setText(s); showPage( 2 ); @@ -263,7 +263,7 @@ void LinkDialog::setLink( const QString& link ) void LinkDialog::slotOk() { - QString str; + TQString str; switch( activePageIndex() ) { case 0: str = i18n( "Internet address is empty" ); break; diff --git a/kspread/dialogs/link.h b/kspread/dialogs/link.h index 12d00973b..c34640fe4 100644 --- a/kspread/dialogs/link.h +++ b/kspread/dialogs/link.h @@ -33,16 +33,17 @@ namespace KSpread class LinkDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - LinkDialog( QWidget* parent, const char* name = 0 ); + LinkDialog( TQWidget* tqparent, const char* name = 0 ); ~LinkDialog(); - QString text() const; - QString link() const; + TQString text() const; + TQString link() const; public slots: - void setText( const QString& text ); - void setLink( const QString& link ); + void setText( const TQString& text ); + void setLink( const TQString& link ); protected slots: void slotOk(); diff --git a/kspread/dialogs/position_cell_format.ui b/kspread/dialogs/position_cell_format.ui index eb3fb8409..6438278ec 100644 --- a/kspread/dialogs/position_cell_format.ui +++ b/kspread/dialogs/position_cell_format.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>PositionTab</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PositionTab</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>7</number> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>horizontalGroup</cstring> </property> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>standard</cstring> </property> @@ -53,15 +53,15 @@ <string>Standard</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>left</cstring> </property> @@ -69,7 +69,7 @@ <string>Left</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>center</cstring> </property> @@ -77,7 +77,7 @@ <string>Center</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>right</cstring> </property> @@ -89,7 +89,7 @@ </widget> </hbox> </widget> - <widget class="QButtonGroup" row="0" column="1"> + <widget class="TQButtonGroup" row="0" column="1"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -106,7 +106,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>top</cstring> </property> @@ -114,7 +114,7 @@ <string>Top</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>middle</cstring> </property> @@ -122,7 +122,7 @@ <string>Middle</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>bottom</cstring> </property> @@ -132,7 +132,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="1" column="1"> + <widget class="TQGroupBox" row="1" column="1"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -146,7 +146,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>angleRotation</cstring> </property> @@ -166,7 +166,7 @@ <number>15</number> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>spinBox3</cstring> </property> @@ -185,7 +185,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -201,7 +201,7 @@ Vertical text puts your text vertically.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>multi</cstring> </property> @@ -209,7 +209,7 @@ Vertical text puts your text vertically.</string> <string>Wrap text</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>vertical</cstring> </property> @@ -219,7 +219,7 @@ Vertical text puts your text vertically.</string> </widget> </vbox> </widget> - <widget class="QGroupBox" row="2" column="1"> + <widget class="TQGroupBox" row="2" column="1"> <property name="name"> <cstring>indentGroup</cstring> </property> @@ -230,7 +230,7 @@ Vertical text puts your text vertically.</string> <string>Set the amount of indent that will be used in the cell when you choose the Format -> Increase Indent or Format -> Decrease Indent menus.</string> </property> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -245,7 +245,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mergeCell</cstring> </property> @@ -255,7 +255,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba </widget> </hbox> </widget> - <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>sizeCellGroup</cstring> </property> @@ -269,15 +269,15 @@ When a merged cell is selected and when you uncheck this, then all cells come ba <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>defaultHeight</cstring> </property> @@ -298,14 +298,14 @@ When a merged cell is selected and when you uncheck this, then all cells come ba <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>10</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -313,7 +313,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba <string>Height:</string> </property> </widget> - <widget class="QFrame" row="0" column="1"> + <widget class="TQFrame" row="0" column="1"> <property name="name"> <cstring>m_heightPanel</cstring> </property> @@ -329,15 +329,15 @@ When a merged cell is selected and when you uncheck this, then all cells come ba </widget> </grid> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>defaultWidth</cstring> </property> @@ -358,14 +358,14 @@ When a merged cell is selected and when you uncheck this, then all cells come ba <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QFrame" row="0" column="1"> + <widget class="TQFrame" row="0" column="1"> <property name="name"> <cstring>m_widthPanel</cstring> </property> @@ -379,7 +379,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba <number>1</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -407,5 +407,5 @@ When a merged cell is selected and when you uncheck this, then all cells come ba <slot>setValue(int)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kspread/dialogs/protection_cell_format.ui b/kspread/dialogs/protection_cell_format.ui index 56b7352f9..bdf9bf77f 100644 --- a/kspread/dialogs/protection_cell_format.ui +++ b/kspread/dialogs/protection_cell_format.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ProtectionTab</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProtectionTab</cstring> </property> @@ -22,7 +22,7 @@ You can learn more about all these settings in the User Manual in the Advanced K <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -33,7 +33,7 @@ You can learn more about all these settings in the User Manual in the Advanced K <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_bDontPrint</cstring> </property> @@ -47,7 +47,7 @@ Note that you can print it even if the cell is protected</string> </widget> </grid> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -58,15 +58,15 @@ Note that you can print it even if the cell is protected</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_bHideAll</cstring> </property> @@ -77,9 +77,9 @@ Note that you can print it even if the cell is protected</string> <string>This hides the cell content and works only when the sheet is protected. Whether the cell itself is protected or not does not matter.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -95,14 +95,14 @@ Note that you can print it even if the cell is protected</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>21</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_bIsProtected</cstring> </property> @@ -118,9 +118,9 @@ Note that you can print it even if the cell is protected</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -136,14 +136,14 @@ Note that you can print it even if the cell is protected</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_bHideFormula</cstring> </property> @@ -176,5 +176,5 @@ Note that you can print it even if the cell is protected</string> <slot>setDisabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kspread/dialogs/sheet_properties.cc b/kspread/dialogs/sheet_properties.cc index e78549356..efd30b033 100644 --- a/kspread/dialogs/sheet_properties.cc +++ b/kspread/dialogs/sheet_properties.cc @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#include <qvbox.h> -#include <qcheckbox.h> +#include <tqvbox.h> +#include <tqcheckbox.h> #include <kcombobox.h> #include <kdialogbase.h> @@ -31,15 +31,15 @@ using namespace KSpread; -SheetPropertiesDialog::SheetPropertiesDialog( QWidget* parent ): - KDialogBase( parent, "sheetPropertiesDialog", true, +SheetPropertiesDialog::SheetPropertiesDialog( TQWidget* tqparent ): + KDialogBase( tqparent, "sheetPropertiesDialog", true, i18n("Sheet Properties"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Default ) { - QVBox* mainWidget = makeVBoxMainWidget(); + TQVBox* mainWidget = makeVBoxMainWidget(); d = new SheetPropertiesBase( mainWidget ); - QWidget* spacer = new QWidget( mainWidget ); - spacer->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding ); + TQWidget* spacer = new TQWidget( mainWidget ); + spacer->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); enableButtonSeparator( true ); } @@ -63,7 +63,7 @@ void SheetPropertiesDialog::slotDefault() setCapitalizeFirstLetter( false ); } -Sheet::LayoutDirection SheetPropertiesDialog::layoutDirection() const +Sheet::LayoutDirection SheetPropertiesDialog::tqlayoutDirection() const { if( d->directionComboBox->currentText() == i18n( "Left to Right" ) ) return Sheet::LeftToRight; diff --git a/kspread/dialogs/sheet_properties.h b/kspread/dialogs/sheet_properties.h index ef20d75c9..b2f364f45 100644 --- a/kspread/dialogs/sheet_properties.h +++ b/kspread/dialogs/sheet_properties.h @@ -20,7 +20,7 @@ #ifndef SHEET_PROPERTIES_DIALOG #define SHEET_PROPERTIES_DIALOG -#include <qwidget.h> +#include <tqwidget.h> #include <kdialogbase.h> #include "kspread_sheet.h" @@ -31,16 +31,17 @@ class SheetPropertiesBase; class SheetPropertiesDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SheetPropertiesDialog( QWidget* parent = 0 ); + SheetPropertiesDialog( TQWidget* tqparent = 0 ); ~SheetPropertiesDialog(); virtual void slotDefault(); - Sheet::LayoutDirection layoutDirection() const; + Sheet::LayoutDirection tqlayoutDirection() const; void setLayoutDirection( Sheet::LayoutDirection dir ); diff --git a/kspread/dialogs/sheet_properties_base.ui b/kspread/dialogs/sheet_properties_base.ui index 588895fd8..f1fe56c85 100644 --- a/kspread/dialogs/sheet_properties_base.ui +++ b/kspread/dialogs/sheet_properties_base.ui @@ -18,7 +18,7 @@ License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</comment> <author>Ariya Hidayat <ariya@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SheetPropertiesBase</cstring> </property> @@ -45,23 +45,23 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -99,7 +99,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -118,22 +118,22 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="4" column="1"> + <widget class="TQCheckBox" row="4" column="1"> <property name="name"> <cstring>showCommentIndicatorCheckBox</cstring> </property> @@ -144,7 +144,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <string>If this box is checked cells containing comments will be marked by a small red triangle at the top right corner.</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>useLCModeCheckBox</cstring> </property> @@ -155,7 +155,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <string>If this box is checked the cell reference shown at the left end of the Formula Bar will be displayed in LC mode (i.e. L2C3) rather than in its normal form B3. This does not seem to be of much use at the moment.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>showPageBordersCheckBox</cstring> </property> @@ -166,7 +166,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <string>If you check this option, the page borders will be drawn on your current sheet. Per default the page borders are not displayed. It is useful to see the page borders if you want to print your sheet.</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0"> + <widget class="TQCheckBox" row="4" column="0"> <property name="name"> <cstring>capitalizeFirstLetterCheckBox</cstring> </property> @@ -177,7 +177,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <string>Check this box and the first letter of any text you type in will automatically be converted to uppercase.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>hideZeroCheckBox</cstring> </property> @@ -188,7 +188,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <string>If this box is checked any cell containing the value zero will appear blank.</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>showFormulaCheckBox</cstring> </property> @@ -199,7 +199,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <string>If this box is checked KSpread will display the actual formulae in cells rather than the results.</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>showColumnAsNumbersCheckBox</cstring> </property> @@ -210,7 +210,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <string>If this box is checked the column headings will show as numbers rather than as letters. Letters are default.</string> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>showFormulaIndicatorCheckBox</cstring> </property> @@ -221,7 +221,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <string>If this box is checked KSpread will display a small blue triangle at the bottom left corner of cells containing formulae. This is useful if you want to protect cells with formulae.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>showGridCheckBox</cstring> </property> @@ -232,7 +232,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <string>If checked the grid (the cell limits) will be shown. This is default. If you uncheck it, the grid willl be hidden.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>autoCalcCheckBox</cstring> </property> @@ -250,8 +250,8 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kcombobox.h</includehint> </includehints> |