diff options
| author | Timothy Pearson <[email protected]> | 2011-12-16 09:56:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-16 09:56:31 -0600 |
| commit | c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 (patch) | |
| tree | 1ee1912ac4bb966475f0db0f2a78678661b4b4a5 /kspread/dialogs/kspread_dlg_cons.cc | |
| parent | 94844816550ad672ccfcdc25659c625546239998 (diff) | |
| download | koffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.tar.gz koffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 94844816550ad672ccfcdc25659c625546239998.
Diffstat (limited to 'kspread/dialogs/kspread_dlg_cons.cc')
| -rw-r--r-- | kspread/dialogs/kspread_dlg_cons.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kspread/dialogs/kspread_dlg_cons.cc b/kspread/dialogs/kspread_dlg_cons.cc index 7d63a668..91589f9f 100644 --- a/kspread/dialogs/kspread_dlg_cons.cc +++ b/kspread/dialogs/kspread_dlg_cons.cc @@ -31,7 +31,7 @@ #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <kdebug.h> @@ -197,14 +197,14 @@ void ConsolidateDialog::slotOk() 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; } @@ -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() ); - TQString 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; } @@ -652,7 +652,7 @@ void ConsolidateDialog::slotReturnPressed() 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; } |