summaryrefslogtreecommitdiffstats
path: root/kspread/dialogs
diff options
context:
space:
mode:
Diffstat (limited to 'kspread/dialogs')
-rw-r--r--kspread/dialogs/SheetSelectWidget.ui2
-rw-r--r--kspread/dialogs/font_cell_format.ui2
-rw-r--r--kspread/dialogs/kspread_dlg_layout.cc22
-rw-r--r--kspread/dialogs/kspread_dlg_layout.h4
-rw-r--r--kspread/dialogs/kspread_dlg_paperlayout.h4
-rw-r--r--kspread/dialogs/kspread_dlg_sort.cc10
-rw-r--r--kspread/dialogs/kspreadsubtotal.ui2
-rw-r--r--kspread/dialogs/position_cell_format.ui2
-rw-r--r--kspread/dialogs/protection_cell_format.ui2
-rw-r--r--kspread/dialogs/sheet_properties.cc2
-rw-r--r--kspread/dialogs/sheet_properties.h2
-rw-r--r--kspread/dialogs/sheet_properties_base.ui4
12 files changed, 29 insertions, 29 deletions
diff --git a/kspread/dialogs/SheetSelectWidget.ui b/kspread/dialogs/SheetSelectWidget.ui
index 525b83f3..6e0b3c0d 100644
--- a/kspread/dialogs/SheetSelectWidget.ui
+++ b/kspread/dialogs/SheetSelectWidget.ui
@@ -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>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults 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 3bb6b78a..6e7f7403 100644
--- a/kspread/dialogs/font_cell_format.ui
+++ b/kspread/dialogs/font_cell_format.ui
@@ -219,7 +219,7 @@ The default font is set for all cells in the Format -&gt; Style Manager menu wit
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
</includehints>
diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc
index 6b5c233b..fcbb734e 100644
--- a/kspread/dialogs/kspread_dlg_layout.cc
+++ b/kspread/dialogs/kspread_dlg_layout.cc
@@ -182,7 +182,7 @@ GeneralTab::GeneralTab( TQWidget* tqparent, CellFormatDialog * dlg )
m_parentBox->insertStringList( tmp );
if ( m_dlg->getStyle()->tqparent() )
- m_parentBox->setCurrentText( m_dlg->getStyle()->tqparentName() );
+ m_parentBox->setCurrentText( m_dlg->getStyle()->parentName() );
else
{
m_parentBox->setCurrentText( i18n( "<None>" ) );
@@ -219,16 +219,16 @@ void GeneralTab::slotNameChanged()
checkName();
}
-void GeneralTab::slotNewParent( const TQString & tqparentName )
+void GeneralTab::slotNewParent( const TQString & parentName )
{
kdDebug() << "New Parent" << endl;
- if ( !checkParent( tqparentName ) )
+ if ( !checkParent( parentName ) )
return;
- if ( tqparentName.isEmpty() || tqparentName == i18n( "<None>" ) )
+ if ( parentName.isEmpty() || parentName == i18n( "<None>" ) )
m_dlg->getStyle()->setParent( 0 );
else
- m_dlg->getStyle()->setParent( m_dlg->getStyleManager()->style( tqparentName ) );
+ m_dlg->getStyle()->setParent( m_dlg->getStyleManager()->style( parentName ) );
// Set difference to new tqparent, set GUI to tqparent values, add changes made before
// m_dlg->initGUI();
@@ -248,17 +248,17 @@ bool GeneralTab::checkName()
return true;
}
-bool GeneralTab::checkParent( const TQString & tqparentName )
+bool GeneralTab::checkParent( const TQString & parentName )
{
- if ( m_dlg->getStyle()->tqparentName() != tqparentName
- && m_parentBox->isEnabled() && tqparentName != i18n( "<None>" ) && !tqparentName.isEmpty() )
+ if ( m_dlg->getStyle()->parentName() != parentName
+ && m_parentBox->isEnabled() && parentName != i18n( "<None>" ) && !parentName.isEmpty() )
{
- if ( m_nameEdit->text() == tqparentName )
+ if ( m_nameEdit->text() == parentName )
{
KMessageBox::sorry( this, i18n( "A style cannot inherit from itself." ) );
return false;
}
- if ( !m_dlg->checkCircle( m_nameEdit->text(), tqparentName ) )
+ if ( !m_dlg->checkCircle( m_nameEdit->text(), parentName ) )
{
KMessageBox::sorry( this,
i18n( "The style cannot inherit from '%1' because of recursive references." )
@@ -266,7 +266,7 @@ bool GeneralTab::checkParent( const TQString & tqparentName )
return false;
}
- CustomStyle * p = m_dlg->getStyleManager()->style( tqparentName );
+ CustomStyle * p = m_dlg->getStyleManager()->style( parentName );
if ( !p )
{
diff --git a/kspread/dialogs/kspread_dlg_layout.h b/kspread/dialogs/kspread_dlg_layout.h
index a16e409d..ddb364e7 100644
--- a/kspread/dialogs/kspread_dlg_layout.h
+++ b/kspread/dialogs/kspread_dlg_layout.h
@@ -145,7 +145,7 @@ class GeneralTab : public TQWidget
bool apply( CustomStyle * style );
protected slots:
- void slotNewParent( const TQString & tqparentName );
+ void slotNewParent( const TQString & parentName );
void slotNameChanged();
private:
@@ -156,7 +156,7 @@ class GeneralTab : public TQWidget
TQString m_name;
TQString m_parent;
- bool checkParent( const TQString & tqparentName );
+ bool checkParent( const TQString & parentName );
bool checkName();
};
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.h b/kspread/dialogs/kspread_dlg_paperlayout.h
index a7316f22..cd3537a3 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.h
+++ b/kspread/dialogs/kspread_dlg_paperlayout.h
@@ -20,8 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __kspread_dlg_papertqlayout__
-#define __kspread_dlg_papertqlayout__
+#ifndef __kspread_dlg_paperlayout__
+#define __kspread_dlg_paperlayout__
#include <kdialogbase.h>
#include <KoPageLayoutDia.h>
diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc
index ac7cd187..3b94da54 100644
--- a/kspread/dialogs/kspread_dlg_sort.cc
+++ b/kspread/dialogs/kspread_dlg_sort.cc
@@ -79,10 +79,10 @@ SortDialog::SortDialog( View * tqparent, const char * name,
//---------------- Sort Layout & Header Row/Column Toggle
//Sort orientation selector (for selecting Left-To-Right or Top-To-Bottom sorting of the selection)
- TQGroupBox* tqlayoutGroup = new TQGroupBox(2 , Qt::Vertical, m_page1, "tqlayoutGroup");
- tqlayoutGroup->setTitle( i18n("Layout") );
+ TQGroupBox* layoutGroup = new TQGroupBox(2 , Qt::Vertical, m_page1, "layoutGroup");
+ layoutGroup->setTitle( i18n("Layout") );
- TQHButtonGroup * orientationGroup = new TQHButtonGroup( tqlayoutGroup, "orientationGroup" );
+ TQHButtonGroup * orientationGroup = new TQHButtonGroup( layoutGroup, "orientationGroup" );
orientationGroup->setLineWidth(0);
orientationGroup->setMargin(0);
orientationGroup->tqlayout()->setMargin(0);
@@ -94,10 +94,10 @@ SortDialog::SortDialog( View * tqparent, const char * name,
m_sortRow->setText( i18n( "Sort &Columns" ) );
//First row / column contains header toggle
- m_firstRowOrColHeader = new TQCheckBox( tqlayoutGroup, "m_copyLayout" );
+ m_firstRowOrColHeader = new TQCheckBox( layoutGroup, "m_copyLayout" );
//m_firstRowOrColHeader->setText( i18n( "&First row contains headers" ) );
m_firstRowOrColHeader->setChecked(true);
- page1Layout->addWidget(tqlayoutGroup,0,0);
+ page1Layout->addWidget(layoutGroup,0,0);
//----------------
diff --git a/kspread/dialogs/kspreadsubtotal.ui b/kspread/dialogs/kspreadsubtotal.ui
index 9cfb871a..cb73b12d 100644
--- a/kspread/dialogs/kspreadsubtotal.ui
+++ b/kspread/dialogs/kspreadsubtotal.ui
@@ -218,5 +218,5 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
</widget>
</grid>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kspread/dialogs/position_cell_format.ui b/kspread/dialogs/position_cell_format.ui
index 6438278e..df2ff211 100644
--- a/kspread/dialogs/position_cell_format.ui
+++ b/kspread/dialogs/position_cell_format.ui
@@ -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>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kspread/dialogs/protection_cell_format.ui b/kspread/dialogs/protection_cell_format.ui
index bdf9bf77..0768d4f7 100644
--- a/kspread/dialogs/protection_cell_format.ui
+++ b/kspread/dialogs/protection_cell_format.ui
@@ -176,5 +176,5 @@ Note that you can print it even if the cell is protected</string>
<slot>setDisabled(bool)</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kspread/dialogs/sheet_properties.cc b/kspread/dialogs/sheet_properties.cc
index efd30b03..2f345103 100644
--- a/kspread/dialogs/sheet_properties.cc
+++ b/kspread/dialogs/sheet_properties.cc
@@ -63,7 +63,7 @@ void SheetPropertiesDialog::slotDefault()
setCapitalizeFirstLetter( false );
}
-Sheet::LayoutDirection SheetPropertiesDialog::tqlayoutDirection() const
+Sheet::LayoutDirection SheetPropertiesDialog::layoutDirection() 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 b2f364f4..6ab51a40 100644
--- a/kspread/dialogs/sheet_properties.h
+++ b/kspread/dialogs/sheet_properties.h
@@ -41,7 +41,7 @@ public:
virtual void slotDefault();
- Sheet::LayoutDirection tqlayoutDirection() const;
+ Sheet::LayoutDirection layoutDirection() const;
void setLayoutDirection( Sheet::LayoutDirection dir );
diff --git a/kspread/dialogs/sheet_properties_base.ui b/kspread/dialogs/sheet_properties_base.ui
index f1fe56c8..0750b8a9 100644
--- a/kspread/dialogs/sheet_properties_base.ui
+++ b/kspread/dialogs/sheet_properties_base.ui
@@ -250,8 +250,8 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kcombobox.h</includehint>
</includehints>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-16 13:33:00 +0000