summaryrefslogtreecommitdiffstats
path: root/src/smalldialogs.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:56:04 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:56:04 -0600
commit303e108109ce526c414e8770119134dcc2f2d7bd (patch)
tree16e7fdb1b604f30ac7b9cb7bbaeae90c34f438a6 /src/smalldialogs.cpp
parentf3372e7bea9bbc288e039d85d660450220a637d8 (diff)
downloadkdiff3-303e108109ce526c414e8770119134dcc2f2d7bd.tar.gz
kdiff3-303e108109ce526c414e8770119134dcc2f2d7bd.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit f3372e7bea9bbc288e039d85d660450220a637d8.
Diffstat (limited to 'src/smalldialogs.cpp')
-rw-r--r--src/smalldialogs.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/smalldialogs.cpp b/src/smalldialogs.cpp
index 8c70b66..7dc6340 100644
--- a/src/smalldialogs.cpp
+++ b/src/smalldialogs.cpp
@@ -25,7 +25,7 @@
#include <tqcheckbox.h>
#include <tqlineedit.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqdragobject.h>
#include <tqregexp.h>
@@ -111,15 +111,15 @@ OpenDialog::OpenDialog(
TQPopupMenu* m = new TQPopupMenu(this);
int id=0;
- m->insertItem( i18n("Swap %1<->%2").arg("A").arg("B"), id++ );
- m->insertItem( i18n("Swap %1<->%2").arg("B").arg("C"), id++ );
- m->insertItem( i18n("Swap %1<->%2").arg("C").arg("A"), id++ );
- m->insertItem( i18n("Copy %1->Output").arg("A"), id++ );
- m->insertItem( i18n("Copy %1->Output").arg("B"), id++ );
- m->insertItem( i18n("Copy %1->Output").arg("C"), id++ );
- m->insertItem( i18n("Swap %1<->Output").arg("A"), id++ );
- m->insertItem( i18n("Swap %1<->Output").arg("B"), id++ );
- m->insertItem( i18n("Swap %1<->Output").arg("C"), id++ );
+ m->insertItem( i18n("Swap %1<->%2").tqarg("A").tqarg("B"), id++ );
+ m->insertItem( i18n("Swap %1<->%2").tqarg("B").tqarg("C"), id++ );
+ m->insertItem( i18n("Swap %1<->%2").tqarg("C").tqarg("A"), id++ );
+ m->insertItem( i18n("Copy %1->Output").tqarg("A"), id++ );
+ m->insertItem( i18n("Copy %1->Output").tqarg("B"), id++ );
+ m->insertItem( i18n("Copy %1->Output").tqarg("C"), id++ );
+ m->insertItem( i18n("Swap %1<->Output").tqarg("A"), id++ );
+ m->insertItem( i18n("Swap %1<->Output").tqarg("B"), id++ );
+ m->insertItem( i18n("Swap %1<->Output").tqarg("C"), id++ );
connect( m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSwapCopyNames(int)));
button->setPopup(m);
@@ -170,7 +170,7 @@ OpenDialog::OpenDialog(
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( reject() ) );
l->addWidget( button,1 );
- TQSize sh = sizeHint();
+ TQSize sh = tqsizeHint();
setFixedHeight( sh.height() );
m_bInputFileNameChanged = false;
@@ -339,47 +339,47 @@ void OpenDialog::slotSwapCopyNames( int id ) // id selected in the popup menu
FindDialog::FindDialog(TQWidget* pParent)
: TQDialog( pParent )
{
- TQGridLayout* layout = new TQGridLayout( this );
- layout->setMargin(5);
- layout->setSpacing(5);
+ TQGridLayout* tqlayout = new TQGridLayout( this );
+ tqlayout->setMargin(5);
+ tqlayout->setSpacing(5);
int line=0;
- layout->addMultiCellWidget( new TQLabel(i18n("Search text:"),this), line,line,0,1 );
+ tqlayout->addMultiCellWidget( new TQLabel(i18n("Search text:"),this), line,line,0,1 );
++line;
m_pSearchString = new TQLineEdit( this );
- layout->addMultiCellWidget( m_pSearchString, line,line,0,1 );
+ tqlayout->addMultiCellWidget( m_pSearchString, line,line,0,1 );
++line;
m_pCaseSensitive = new TQCheckBox(i18n("Case sensitive"),this);
- layout->addWidget( m_pCaseSensitive, line, 1 );
+ tqlayout->addWidget( m_pCaseSensitive, line, 1 );
m_pSearchInA = new TQCheckBox(i18n("Search A"),this);
- layout->addWidget( m_pSearchInA, line, 0 );
+ tqlayout->addWidget( m_pSearchInA, line, 0 );
m_pSearchInA->setChecked( true );
++line;
m_pSearchInB = new TQCheckBox(i18n("Search B"),this);
- layout->addWidget( m_pSearchInB, line, 0 );
+ tqlayout->addWidget( m_pSearchInB, line, 0 );
m_pSearchInB->setChecked( true );
++line;
m_pSearchInC = new TQCheckBox(i18n("Search C"),this);
- layout->addWidget( m_pSearchInC, line, 0 );
+ tqlayout->addWidget( m_pSearchInC, line, 0 );
m_pSearchInC->setChecked( true );
++line;
m_pSearchInOutput = new TQCheckBox(i18n("Search output"),this);
- layout->addWidget( m_pSearchInOutput, line, 0 );
+ tqlayout->addWidget( m_pSearchInOutput, line, 0 );
m_pSearchInOutput->setChecked( true );
++line;
TQPushButton* pButton = new TQPushButton( i18n("&Search"), this );
- layout->addWidget( pButton, line, 0 );
+ tqlayout->addWidget( pButton, line, 0 );
connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
pButton = new TQPushButton( i18n("&Cancel"), this );
- layout->addWidget( pButton, line, 1 );
+ tqlayout->addWidget( pButton, line, 1 );
connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()));
hide();
@@ -498,7 +498,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
pGrid->addWidget(pButton,line,1);
connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()));
- resize( 800, sizeHint().height() );
+ resize( 800, tqsizeHint().height() );
}
void RegExpTester::init( const TQString& autoMergeRegExp, const TQString& historyStartRegExp, const TQString& historyEntryStartRegExp, const TQString historySortKeyOrder )